diff --git a/README.md b/README.md
index 258fdb6b..671e6aa9 100644
--- a/README.md
+++ b/README.md
@@ -183,12 +183,12 @@ Clone DlangUI repository
 
 Enter dlangui directory
 
-		cd dlangui
+        cd dlangui
 
 Clone dependency libraries
 
-		mkdir deps
-		cd deps
+        mkdir deps
+        cd deps
         git clone https://github.com/DerelictOrg/DerelictUtil.git
         git clone https://github.com/DerelictOrg/DerelictGL3.git
         git clone https://github.com/DerelictOrg/DerelictFT.git
@@ -217,12 +217,12 @@ Clone DlangUI repository
 
 Enter dlangui directory
 
-		cd dlangui
+        cd dlangui
 
 Clone dependency libraries to dlangui/deps directory
 
-		mkdir deps
-		cd deps
+        mkdir deps
+        cd deps
         git clone https://github.com/DerelictOrg/DerelictUtil.git
         git clone https://github.com/DerelictOrg/DerelictGL3.git
         git clone https://github.com/DerelictOrg/DerelictFT.git
@@ -233,7 +233,7 @@ Clone dependency libraries to dlangui/deps directory
 
 Open solution file with Mono-D	
 
-		dlangui-monod-linux.sln
+        dlangui-monod-linux.sln
 
 Try running examples: helloworld, example1, tetris, dmledit
 
@@ -276,6 +276,150 @@ Now you can build and run your project.
 To hack DlangIDE project, you can clone it from https://github.com/buggins/dlangide.git into the same directory dlangui is cloned to. Then just open solution dlangide/dlangide-monod-linux.sln with mono-d.
 
 
+Windows development using Mono-D
+--------------------------------
+
+Install GIT, DUB, DMD, MonoDevelop with Mono-D plugin.
+
+
+Clone DlangUI repository
+
+        git clone https://github.com/buggins/dlangui.git
+
+Enter dlangui directory
+
+        cd dlangui
+
+Clone dependency libraries to dlangui/deps directory
+
+        mkdir deps
+        cd deps
+        git clone https://github.com/DerelictOrg/DerelictUtil.git
+        git clone https://github.com/DerelictOrg/DerelictGL3.git
+        git clone https://github.com/DerelictOrg/DerelictFT.git
+        git clone https://github.com/DerelictOrg/DerelictSDL2.git
+        git clone https://github.com/gecko0307/dlib.git
+        git clone https://github.com/Dav1dde/gl3n.git
+        git clone https://github.com/Devisualization/image.git de_image
+
+Open solution file with Mono-D	
+
+        dlangui-monod-windows.sln
+
+Try running examples: helloworld, example1, tetris, dmledit
+
+Configurations Debug, Release, Unittest build SDL2+OpenGL versions of apps.
+
+Configurations DebugMinimal, ReleaseMinimal, UnittestMinimal build pure win32 versions of apps w/o OpenGL.
+
+
+If you are creating your own solution / project which uses DlangUI in Mono-D:
+
+  * Create new solution (assuming that solution directory is located in the same directory as dlangui and "Create directory for solution" option is unchecked; if no - you will need to correct pathes)
+  * Add / create source files of your project (e.g. copy+paste helloworld.d)
+  * Add dlangui library project dlangui/dlangui-monod-linux.dproj to solution
+  
+Following settings are to be applied to all configurations of your new project (Debug, Release, Unittest):
+
+  * In your project options Build/Project Dependencies - mark dlangui-monod-linux item
+  * In your project options Build/Compiling/Linking - check "Link in static/shared libraries from nested dependencies"
+  * In your project options Build/Compiling/Compiling - specify Version constants as "USE_FREETYPE;USE_OPENGL;EmbedStandardResources;Unicode;windows" (EmbedStandardResources is required if you want to embed your own additional resources into executable)
+  * If your project needs to embed some resources into executable (usually from "views" directory), specify all directories which contain resources in Build/Compiling/Compiling/Extra Compiler Options, e.g.:
+  
+        -Jviews
+        -Jviews/res
+        -Jviews/res/i18n
+        -Jviews/res/mdpi
+        -Jviews/res/hdpi
+  
+  * In your project options Build/Includes put list of import directories of DlangUI library and its dependencies, like
+  
+        ../dlangui/src
+        ../dlangui/deps/dlib
+        ../dlangui/deps/gl3n
+        ../dlangui/deps/DerelictSDL2/source
+        ../dlangui/deps/DerelictFT/source
+        ../dlangui/deps/DerelictGL3/source
+        ../dlangui/deps/DerelictUtil/source
+
+Now you can build and run your project.
+ 
+To hack DlangIDE project, you can clone it from https://github.com/buggins/dlangide.git into the same directory dlangui is cloned to. Then just open solution dlangide/dlangide-monod-linux.sln with mono-d.
+
+
+Windows development using VisualD
+---------------------------------
+
+Install GIT, DUB, DMD, MS Visual Studio (e.g. Community 2013) + VisualD plugin
+
+
+Clone DlangUI repository
+
+        git clone https://github.com/buggins/dlangui.git
+
+Enter dlangui directory
+
+        cd dlangui
+
+Clone dependency libraries to dlangui/deps directory
+
+        mkdir deps
+        cd deps
+        git clone https://github.com/DerelictOrg/DerelictUtil.git
+        git clone https://github.com/DerelictOrg/DerelictGL3.git
+        git clone https://github.com/DerelictOrg/DerelictFT.git
+        git clone https://github.com/DerelictOrg/DerelictSDL2.git
+        git clone https://github.com/gecko0307/dlib.git
+        git clone https://github.com/Dav1dde/gl3n.git
+        git clone https://github.com/Devisualization/image.git de_image
+
+Open solution file with Visual-D
+
+        dlangui-msvc.sln
+
+Try running examples: helloworld, example1, tetris, dmledit
+
+Configurations Debug, Release, Unittest build SDL2+OpenGL versions of apps.
+
+Configurations DebugMinimal, ReleaseMinimal, UnittestMinimal build pure win32 versions of apps w/o OpenGL.
+
+
+If you are creating your own solution / project which uses DlangUI in Mono-D:
+
+  * Create new solution (assuming that solution directory is located in the same directory as dlangui and "Create directory for solution" option is unchecked; if no - you will need to correct pathes)
+  * Add / create source files of your project (e.g. copy+paste helloworld.d)
+  * Add dlangui library project dlangui/dlangui-monod-linux.dproj to solution
+  
+Following settings are to be applied to all configurations of your new project (Debug, Release, Unittest):
+
+  * In your project options Build/Project Dependencies - mark dlangui-monod-linux item
+  * In your project options Build/Compiling/Linking - check "Link in static/shared libraries from nested dependencies"
+  * In your project options Build/Compiling/Compiling - specify Version constants as "USE_FREETYPE;USE_OPENGL;EmbedStandardResources;Unicode;windows" (EmbedStandardResources is required if you want to embed your own additional resources into executable)
+  * If your project needs to embed some resources into executable (usually from "views" directory), specify all directories which contain resources in Build/Compiling/Compiling/Extra Compiler Options, e.g.:
+  
+        -Jviews
+        -Jviews/res
+        -Jviews/res/i18n
+        -Jviews/res/mdpi
+        -Jviews/res/hdpi
+  
+  * In your project options Build/Includes put list of import directories of DlangUI library and its dependencies, like
+  
+        ../dlangui/src
+        ../dlangui/deps/dlib
+        ../dlangui/deps/gl3n
+        ../dlangui/deps/DerelictSDL2/source
+        ../dlangui/deps/DerelictFT/source
+        ../dlangui/deps/DerelictGL3/source
+        ../dlangui/deps/DerelictUtil/source
+
+Now you can build and run your project.
+ 
+To hack DlangIDE project, you can clone it from https://github.com/buggins/dlangide.git into the same directory dlangui is cloned to. Then just open solution dlangide/dlangide-monod-linux.sln with mono-d.
+
+
+
+
 
 Linux builds (DUB)
 ------------------
diff --git a/dlangui-monod-osx.dproj b/dlangui-monod-osx.dproj
index b691eebd..16cd0ae6 100644
--- a/dlangui-monod-osx.dproj
+++ b/dlangui-monod-osx.dproj
@@ -14,27 +14,6 @@
       </Includes>
     </Includes>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release</OutputPath>
-    <ObjectsDirectory>obj/Release</ObjectsDirectory>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
-    <UnittestMode>false</UnittestMode>
-    <OutputName>libdlangui-monod-osx</OutputName>
-    <Target>StaticLibrary</Target>
-    <Externalconsole>true</Externalconsole>
-    <DebugLevel>0</DebugLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Unittest</OutputPath>
-    <ObjectsDirectory>obj/Unittest</ObjectsDirectory>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
-    <UnittestMode>true</UnittestMode>
-    <OutputName>libdlangui-monod-osx</OutputName>
-    <Target>Executable</Target>
-    <Externalconsole>true</Externalconsole>
-    <DebugLevel>0</DebugLevel>
-  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug</OutputPath>
@@ -47,7 +26,7 @@
       </VersionIds>
     </VersionIds>
     <ObjectsDirectory>obj/Debug</ObjectsDirectory>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
     <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
     <UnittestMode>false</UnittestMode>
     <OutputName>libdlangui-monod-osx</OutputName>
@@ -55,6 +34,45 @@
     <Externalconsole>true</Externalconsole>
     <DebugLevel>0</DebugLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\Release</OutputPath>
+    <ObjectsDirectory>obj/Release</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <UnittestMode>false</UnittestMode>
+    <OutputName>libdlangui-monod-osx</OutputName>
+    <Target>StaticLibrary</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_SDL</String>
+        <String>USE_OPENGL</String>
+        <String>USE_FREETYPE</String>
+        <String>EmbedStandardResources</String>
+      </VersionIds>
+    </VersionIds>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Unittest</OutputPath>
+    <ObjectsDirectory>obj/Unittest</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <UnittestMode>true</UnittestMode>
+    <OutputName>libdlangui-monod-osx</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_SDL</String>
+        <String>USE_OPENGL</String>
+        <String>USE_FREETYPE</String>
+        <String>EmbedStandardResources</String>
+      </VersionIds>
+    </VersionIds>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="src\dlangui\core\collections.d" />
     <Compile Include="src\dlangui\core\editable.d" />
diff --git a/dlangui-monod-osx.sln b/dlangui-monod-osx.sln
index 9eb771d7..be9b9ba5 100644
--- a/dlangui-monod-osx.sln
+++ b/dlangui-monod-osx.sln
@@ -7,6 +7,12 @@ Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "example1-monod-osx", "examp
 EndProject
 Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "derelictcocoatest-monod-osx", "examples\derelictcocoatest-monod-osx\derelictcocoatest-monod-osx.dproj", "{1F050D82-5245-4B51-A554-473194EA0DE9}"
 EndProject
+Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "dmledit-monod-osx", "examples\dmledit\dmledit-monod-osx.dproj", "{8E3B1C65-63A3-4BD8-9268-604EE648E861}"
+EndProject
+Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "helloworld-monod-osx", "examples\helloworld\helloworld-monod-osx.dproj", "{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}"
+EndProject
+Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "tetris-monod-osx", "examples\tetris\tetris-monod-osx.dproj", "{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -16,21 +22,39 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Debug|Any CPU.Build.0 = Debug|x64
-		{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Unittest|Any CPU.ActiveCfg = Unittest|Any CPU
-		{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Unittest|Any CPU.Build.0 = Unittest|Any CPU
+		{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Release|Any CPU.ActiveCfg = Release|x64
+		{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Release|Any CPU.Build.0 = Release|x64
+		{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Unittest|Any CPU.ActiveCfg = Unittest|x64
+		{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Unittest|Any CPU.Build.0 = Unittest|x64
+		{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}.Debug|Any CPU.Build.0 = Debug|x64
+		{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}.Release|Any CPU.ActiveCfg = Release|x64
+		{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}.Release|Any CPU.Build.0 = Release|x64
+		{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}.Unittest|Any CPU.ActiveCfg = Unittest|x64
+		{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}.Unittest|Any CPU.Build.0 = Unittest|x64
 		{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Debug|Any CPU.Build.0 = Debug|x64
-		{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Unittest|Any CPU.ActiveCfg = Unittest|Any CPU
-		{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Unittest|Any CPU.Build.0 = Unittest|Any CPU
+		{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Release|Any CPU.ActiveCfg = Release|x64
+		{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Release|Any CPU.Build.0 = Release|x64
+		{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Unittest|Any CPU.ActiveCfg = Unittest|x64
+		{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Unittest|Any CPU.Build.0 = Unittest|x64
 		{1F050D82-5245-4B51-A554-473194EA0DE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F050D82-5245-4B51-A554-473194EA0DE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F050D82-5245-4B51-A554-473194EA0DE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F050D82-5245-4B51-A554-473194EA0DE9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1F050D82-5245-4B51-A554-473194EA0DE9}.Unittest|Any CPU.ActiveCfg = Unittest|Any CPU
 		{1F050D82-5245-4B51-A554-473194EA0DE9}.Unittest|Any CPU.Build.0 = Unittest|Any CPU
+		{8E3B1C65-63A3-4BD8-9268-604EE648E861}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{8E3B1C65-63A3-4BD8-9268-604EE648E861}.Debug|Any CPU.Build.0 = Debug|x64
+		{8E3B1C65-63A3-4BD8-9268-604EE648E861}.Release|Any CPU.ActiveCfg = Release|x64
+		{8E3B1C65-63A3-4BD8-9268-604EE648E861}.Release|Any CPU.Build.0 = Release|x64
+		{8E3B1C65-63A3-4BD8-9268-604EE648E861}.Unittest|Any CPU.ActiveCfg = Unittest|x64
+		{8E3B1C65-63A3-4BD8-9268-604EE648E861}.Unittest|Any CPU.Build.0 = Unittest|x64
+		{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}.Debug|Any CPU.Build.0 = Debug|x64
+		{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}.Release|Any CPU.ActiveCfg = Release|x64
+		{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}.Release|Any CPU.Build.0 = Release|x64
+		{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}.Unittest|Any CPU.ActiveCfg = Unittest|x64
+		{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}.Unittest|Any CPU.Build.0 = Unittest|x64
 	EndGlobalSection
 EndGlobal
diff --git a/dlangui-monod-windows.dproj b/dlangui-monod-windows.dproj
new file mode 100644
index 00000000..4900b78a
--- /dev/null
+++ b/dlangui-monod-windows.dproj
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <ProjectGuid>{45FB40CD-E99A-4C12-AC52-C13364412E09}</ProjectGuid>
+    <Compiler>DMD2</Compiler>
+    <PreferOneStepBuild>true</PreferOneStepBuild>
+    <UseDefaultCompiler>true</UseDefaultCompiler>
+    <IncrementalLinking>true</IncrementalLinking>
+    <Includes>
+      <Includes>
+        <Path>src</Path>
+        <Path>deps\DerelictFT\source</Path>
+        <Path>deps\DerelictSDL2\source</Path>
+        <Path>deps\DerelictGL3\source</Path>
+        <Path>deps\DerelictUtil\source</Path>
+        <Path>deps\gl3n</Path>
+        <Path>deps\dlib</Path>
+      </Includes>
+    </Includes>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug</OutputPath>
+    <Externalconsole>true</Externalconsole>
+    <Target>StaticLibrary</Target>
+    <OutputName>libdlangui-monod-windows</OutputName>
+    <UnittestMode>false</UnittestMode>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Debug</ObjectsDirectory>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+      </VersionIds>
+    </VersionIds>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\Release</OutputPath>
+    <Externalconsole>true</Externalconsole>
+    <Target>StaticLibrary</Target>
+    <OutputName>libdlangui-monod-windows</OutputName>
+    <UnittestMode>false</UnittestMode>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Release</ObjectsDirectory>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+      </VersionIds>
+    </VersionIds>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Unittest</OutputPath>
+    <Externalconsole>true</Externalconsole>
+    <Target>Executable</Target>
+    <OutputName>libdlangui-monod-windows</OutputName>
+    <UnittestMode>true</UnittestMode>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Unittest</ObjectsDirectory>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+      </VersionIds>
+    </VersionIds>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="src\dlangui\package.d" />
+    <Compile Include="src\dlangui\core\collections.d" />
+    <Compile Include="src\dlangui\core\editable.d" />
+    <Compile Include="src\dlangui\core\events.d" />
+    <Compile Include="src\dlangui\core\files.d" />
+    <Compile Include="src\dlangui\core\i18n.d" />
+    <Compile Include="src\dlangui\core\linestream.d" />
+    <Compile Include="src\dlangui\core\logger.d" />
+    <Compile Include="src\dlangui\core\settings.d" />
+    <Compile Include="src\dlangui\core\signals.d" />
+    <Compile Include="src\dlangui\core\stdaction.d" />
+    <Compile Include="src\dlangui\core\streams.d" />
+    <Compile Include="src\dlangui\core\textsource.d" />
+    <Compile Include="src\dlangui\core\types.d" />
+    <Compile Include="src\dlangui\dialogs\dialog.d" />
+    <Compile Include="src\dlangui\dialogs\filedlg.d" />
+    <Compile Include="src\dlangui\dialogs\msgbox.d" />
+    <Compile Include="src\dlangui\dialogs\settingsdialog.d" />
+    <Compile Include="src\dlangui\dml\annotations.d" />
+    <Compile Include="src\dlangui\dml\dmlhighlight.d" />
+    <Compile Include="src\dlangui\dml\parser.d" />
+    <Compile Include="src\dlangui\graphics\colors.d" />
+    <Compile Include="src\dlangui\graphics\drawbuf.d" />
+    <Compile Include="src\dlangui\graphics\fonts.d" />
+    <Compile Include="src\dlangui\graphics\ftfonts.d" />
+    <Compile Include="src\dlangui\graphics\gldrawbuf.d" />
+    <Compile Include="src\dlangui\graphics\glsupport.d" />
+    <Compile Include="src\dlangui\graphics\images.d" />
+    <Compile Include="src\dlangui\graphics\resources.d" />
+    <Compile Include="src\dlangui\graphics\scene\camera.d" />
+    <Compile Include="src\dlangui\graphics\scene\node.d" />
+    <Compile Include="src\dlangui\graphics\scene\scene3d.d" />
+    <Compile Include="src\dlangui\graphics\scene\transform.d" />
+    <Compile Include="src\dlangui\graphics\xpm\colors.d" />
+    <Compile Include="src\dlangui\graphics\xpm\reader.d" />
+    <Compile Include="src\dlangui\platforms\common\platform.d" />
+    <Compile Include="src\dlangui\platforms\sdl\sdlapp.d" />
+    <Compile Include="src\dlangui\platforms\windows\win32drawbuf.d" />
+    <Compile Include="src\dlangui\platforms\windows\win32fonts.d" />
+    <Compile Include="src\dlangui\platforms\windows\winapp.d" />
+    <Compile Include="src\dlangui\widgets\appframe.d" />
+    <Compile Include="src\dlangui\widgets\combobox.d" />
+    <Compile Include="src\dlangui\widgets\controls.d" />
+    <Compile Include="src\dlangui\widgets\docks.d" />
+    <Compile Include="src\dlangui\widgets\editors.d" />
+    <Compile Include="src\dlangui\widgets\grid.d" />
+    <Compile Include="src\dlangui\widgets\layouts.d" />
+    <Compile Include="src\dlangui\widgets\lists.d" />
+    <Compile Include="src\dlangui\widgets\menu.d" />
+    <Compile Include="src\dlangui\widgets\metadata.d" />
+    <Compile Include="src\dlangui\widgets\popup.d" />
+    <Compile Include="src\dlangui\widgets\scroll.d" />
+    <Compile Include="src\dlangui\widgets\srcedit.d" />
+    <Compile Include="src\dlangui\widgets\statusline.d" />
+    <Compile Include="src\dlangui\widgets\styles.d" />
+    <Compile Include="src\dlangui\widgets\tabs.d" />
+    <Compile Include="src\dlangui\widgets\toolbars.d" />
+    <Compile Include="src\dlangui\widgets\tree.d" />
+    <Compile Include="src\dlangui\widgets\widget.d" />
+    <Compile Include="src\dlangui\widgets\winframe.d" />
+    <Compile Include="3rdparty\win32\basetsd.d" />
+    <Compile Include="3rdparty\win32\basetyps.d" />
+    <Compile Include="3rdparty\win32\cderr.d" />
+    <Compile Include="3rdparty\win32\cguid.d" />
+    <Compile Include="3rdparty\win32\commctrl.d" />
+    <Compile Include="3rdparty\win32\commdlg.d" />
+    <Compile Include="3rdparty\win32\core.d" />
+    <Compile Include="3rdparty\win32\dde.d" />
+    <Compile Include="3rdparty\win32\ddeml.d" />
+    <Compile Include="3rdparty\win32\dlgs.d" />
+    <Compile Include="3rdparty\win32\imm.d" />
+    <Compile Include="3rdparty\win32\lzexpand.d" />
+    <Compile Include="3rdparty\win32\mmsystem.d" />
+    <Compile Include="3rdparty\win32\nb30.d" />
+    <Compile Include="3rdparty\win32\oaidl.d" />
+    <Compile Include="3rdparty\win32\objbase.d" />
+    <Compile Include="3rdparty\win32\objfwd.d" />
+    <Compile Include="3rdparty\win32\objidl.d" />
+    <Compile Include="3rdparty\win32\ocidl.d" />
+    <Compile Include="3rdparty\win32\ole.d" />
+    <Compile Include="3rdparty\win32\ole2.d" />
+    <Compile Include="3rdparty\win32\oleauto.d" />
+    <Compile Include="3rdparty\win32\olectlid.d" />
+    <Compile Include="3rdparty\win32\oleidl.d" />
+    <Compile Include="3rdparty\win32\prsht.d" />
+    <Compile Include="3rdparty\win32\psapi.d" />
+    <Compile Include="3rdparty\win32\rpc.d" />
+    <Compile Include="3rdparty\win32\rpcdce.d" />
+    <Compile Include="3rdparty\win32\rpcdcep.d" />
+    <Compile Include="3rdparty\win32\rpcndr.d" />
+    <Compile Include="3rdparty\win32\rpcnsi.d" />
+    <Compile Include="3rdparty\win32\rpcnsip.d" />
+    <Compile Include="3rdparty\win32\rpcnterr.d" />
+    <Compile Include="3rdparty\win32\shellapi.d" />
+    <Compile Include="3rdparty\win32\shlguid.d" />
+    <Compile Include="3rdparty\win32\shlobj.d" />
+    <Compile Include="3rdparty\win32\unknwn.d" />
+    <Compile Include="3rdparty\win32\uuid.d" />
+    <Compile Include="3rdparty\win32\w32api.d" />
+    <Compile Include="3rdparty\win32\winbase.d" />
+    <Compile Include="3rdparty\win32\wincon.d" />
+    <Compile Include="3rdparty\win32\windef.d" />
+    <Compile Include="3rdparty\win32\windows.d" />
+    <Compile Include="3rdparty\win32\winerror.d" />
+    <Compile Include="3rdparty\win32\wingdi.d" />
+    <Compile Include="3rdparty\win32\winnetwk.d" />
+    <Compile Include="3rdparty\win32\winnls.d" />
+    <Compile Include="3rdparty\win32\winnt.d" />
+    <Compile Include="3rdparty\win32\winperf.d" />
+    <Compile Include="3rdparty\win32\winsock2.d" />
+    <Compile Include="3rdparty\win32\winspool.d" />
+    <Compile Include="3rdparty\win32\winsvc.d" />
+    <Compile Include="3rdparty\win32\winuser.d" />
+    <Compile Include="3rdparty\win32\winver.d" />
+    <Compile Include="3rdparty\win32\ws2tcpip.d" />
+    <Compile Include="3rdparty\win32\wtypes.d" />
+    <Compile Include="deps\DerelictFT\source\derelict\freetype\ft.d" />
+    <Compile Include="deps\DerelictFT\source\derelict\freetype\functions.d" />
+    <Compile Include="deps\DerelictFT\source\derelict\freetype\types.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\arb.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\cgl.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\constants.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\deprecatedConstants.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\deprecatedFunctions.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\ext.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\functions.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\gl.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\gl3.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\glx.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\glxext.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\internal.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\types.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\wgl.d" />
+    <Compile Include="deps\DerelictGL3\source\derelict\opengl3\wglext.d" />
+    <Compile Include="deps\DerelictSDL2\source\derelict\sdl2\functions.d" />
+    <Compile Include="deps\DerelictSDL2\source\derelict\sdl2\image.d" />
+    <Compile Include="deps\DerelictSDL2\source\derelict\sdl2\mixer.d" />
+    <Compile Include="deps\DerelictSDL2\source\derelict\sdl2\net.d" />
+    <Compile Include="deps\DerelictSDL2\source\derelict\sdl2\sdl.d" />
+    <Compile Include="deps\DerelictSDL2\source\derelict\sdl2\ttf.d" />
+    <Compile Include="deps\DerelictSDL2\source\derelict\sdl2\types.d" />
+    <Compile Include="deps\DerelictUtil\source\derelict\util\exception.d" />
+    <Compile Include="deps\DerelictUtil\source\derelict\util\loader.d" />
+    <Compile Include="deps\DerelictUtil\source\derelict\util\sharedlib.d" />
+    <Compile Include="deps\DerelictUtil\source\derelict\util\system.d" />
+    <Compile Include="deps\DerelictUtil\source\derelict\util\wintypes.d" />
+    <Compile Include="deps\DerelictUtil\source\derelict\util\xtypes.d" />
+    <Compile Include="deps\dlib\dlib\image\io\bmp.d" />
+    <Compile Include="deps\dlib\dlib\image\io\idct.d" />
+    <Compile Include="deps\dlib\dlib\image\io\io.d" />
+    <Compile Include="deps\dlib\dlib\image\io\jpeg.d" />
+    <Compile Include="deps\dlib\dlib\image\io\png.d" />
+    <Compile Include="deps\dlib\dlib\image\io\tga.d" />
+    <Compile Include="deps\dlib\dlib\image\io\utils.d" />
+    <Compile Include="deps\dlib\dlib\image\arithmetics.d" />
+    <Compile Include="deps\dlib\dlib\image\color.d" />
+    <Compile Include="deps\dlib\dlib\image\image.d" />
+    <Compile Include="deps\dlib\dlib\core\bitio.d" />
+    <Compile Include="deps\dlib\dlib\core\compound.d" />
+    <Compile Include="deps\dlib\dlib\core\memory.d" />
+    <Compile Include="deps\dlib\dlib\core\oop.d" />
+    <Compile Include="deps\dlib\dlib\core\tuple.d" />
+    <Compile Include="deps\dlib\dlib\filesystem\delegaterange.d" />
+    <Compile Include="deps\dlib\dlib\filesystem\dirrange.d" />
+    <Compile Include="deps\dlib\dlib\filesystem\filesystem.d" />
+    <Compile Include="deps\dlib\dlib\filesystem\local.d" />
+    <Compile Include="deps\dlib\dlib\functional\combinators.d" />
+    <Compile Include="deps\dlib\dlib\functional\range.d" />
+    <Compile Include="deps\dlib\dlib\math\decomposition.d" />
+    <Compile Include="deps\dlib\dlib\math\interpolation.d" />
+    <Compile Include="deps\dlib\dlib\math\linsolve.d" />
+    <Compile Include="deps\dlib\dlib\math\matrix.d" />
+    <Compile Include="deps\dlib\dlib\math\utils.d" />
+    <Compile Include="deps\dlib\dlib\math\vector.d" />
+    <Compile Include="deps\gl3n\gl3n\aabb.d" />
+    <Compile Include="deps\gl3n\gl3n\frustum.d" />
+    <Compile Include="deps\gl3n\gl3n\interpolate.d" />
+    <Compile Include="deps\gl3n\gl3n\linalg.d" />
+    <Compile Include="deps\gl3n\gl3n\math.d" />
+    <Compile Include="deps\gl3n\gl3n\plane.d" />
+    <Compile Include="deps\gl3n\gl3n\util.d" />
+    <Compile Include="deps\dlib\dlib\core\stream.d" />
+    <Compile Include="deps\dlib\dlib\filesystem\windows\common.d" />
+    <Compile Include="deps\dlib\dlib\filesystem\windows\directory.d" />
+    <Compile Include="deps\dlib\dlib\filesystem\windows\file.d" />
+    <Compile Include="deps\dlib\dlib\coding\huffman.d" />
+    <Compile Include="deps\dlib\dlib\coding\zlib.d" />
+    <Compile Include="deps\dlib\dlib\container\array.d" />
+    <Compile Include="3rdparty\fontconfig\functions.d" />
+    <Compile Include="3rdparty\fontconfig\package.d" />
+    <Compile Include="3rdparty\fontconfig\types.d" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="3rdparty\win32\makefile" />
+    <None Include="3rdparty\win32\readme.txt" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/dlangui-monod-windows.sln b/dlangui-monod-windows.sln
new file mode 100644
index 00000000..8d64e492
--- /dev/null
+++ b/dlangui-monod-windows.sln
@@ -0,0 +1,52 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "dlangui-monod-windows", "dlangui-monod-windows.dproj", "{45FB40CD-E99A-4C12-AC52-C13364412E09}"
+EndProject
+Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "dmledit-monod-windows", "examples\dmledit\dmledit-monod-windows.dproj", "{620F56F7-F6DE-45D2-955D-912A22EE728A}"
+EndProject
+Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "example1-monod-windows", "examples\example1\example1-monod-windows.dproj", "{32EF3B89-10C6-451E-90B9-868693B30D0F}"
+EndProject
+Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "helloworld-monod-windows", "examples\helloworld\helloworld-monod-windows.dproj", "{5EB161E7-0DB3-459F-86C5-32A84A3F4334}"
+EndProject
+Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "tetris-monod-windows", "examples\tetris\tetris-monod-windows.dproj", "{55D1FE26-E1FC-4787-9E22-D6385BA7C066}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		Unittest|Any CPU = Unittest|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{32EF3B89-10C6-451E-90B9-868693B30D0F}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{32EF3B89-10C6-451E-90B9-868693B30D0F}.Debug|Any CPU.Build.0 = Debug|x64
+		{32EF3B89-10C6-451E-90B9-868693B30D0F}.Release|Any CPU.ActiveCfg = Release|x64
+		{32EF3B89-10C6-451E-90B9-868693B30D0F}.Release|Any CPU.Build.0 = Release|x64
+		{32EF3B89-10C6-451E-90B9-868693B30D0F}.Unittest|Any CPU.ActiveCfg = Unittest|x64
+		{32EF3B89-10C6-451E-90B9-868693B30D0F}.Unittest|Any CPU.Build.0 = Unittest|x64
+		{45FB40CD-E99A-4C12-AC52-C13364412E09}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{45FB40CD-E99A-4C12-AC52-C13364412E09}.Debug|Any CPU.Build.0 = Debug|x64
+		{45FB40CD-E99A-4C12-AC52-C13364412E09}.Release|Any CPU.ActiveCfg = Release|x64
+		{45FB40CD-E99A-4C12-AC52-C13364412E09}.Release|Any CPU.Build.0 = Release|x64
+		{45FB40CD-E99A-4C12-AC52-C13364412E09}.Unittest|Any CPU.ActiveCfg = Unittest|x64
+		{45FB40CD-E99A-4C12-AC52-C13364412E09}.Unittest|Any CPU.Build.0 = Unittest|x64
+		{55D1FE26-E1FC-4787-9E22-D6385BA7C066}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{55D1FE26-E1FC-4787-9E22-D6385BA7C066}.Debug|Any CPU.Build.0 = Debug|x64
+		{55D1FE26-E1FC-4787-9E22-D6385BA7C066}.Release|Any CPU.ActiveCfg = Release|x64
+		{55D1FE26-E1FC-4787-9E22-D6385BA7C066}.Release|Any CPU.Build.0 = Release|x64
+		{55D1FE26-E1FC-4787-9E22-D6385BA7C066}.Unittest|Any CPU.ActiveCfg = Unittest|x64
+		{55D1FE26-E1FC-4787-9E22-D6385BA7C066}.Unittest|Any CPU.Build.0 = Unittest|x64
+		{5EB161E7-0DB3-459F-86C5-32A84A3F4334}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{5EB161E7-0DB3-459F-86C5-32A84A3F4334}.Debug|Any CPU.Build.0 = Debug|x64
+		{5EB161E7-0DB3-459F-86C5-32A84A3F4334}.Release|Any CPU.ActiveCfg = Release|x64
+		{5EB161E7-0DB3-459F-86C5-32A84A3F4334}.Release|Any CPU.Build.0 = Release|x64
+		{5EB161E7-0DB3-459F-86C5-32A84A3F4334}.Unittest|Any CPU.ActiveCfg = Unittest|x64
+		{5EB161E7-0DB3-459F-86C5-32A84A3F4334}.Unittest|Any CPU.Build.0 = Unittest|x64
+		{620F56F7-F6DE-45D2-955D-912A22EE728A}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{620F56F7-F6DE-45D2-955D-912A22EE728A}.Debug|Any CPU.Build.0 = Debug|x64
+		{620F56F7-F6DE-45D2-955D-912A22EE728A}.Release|Any CPU.ActiveCfg = Release|x64
+		{620F56F7-F6DE-45D2-955D-912A22EE728A}.Release|Any CPU.Build.0 = Release|x64
+		{620F56F7-F6DE-45D2-955D-912A22EE728A}.Unittest|Any CPU.ActiveCfg = Unittest|x64
+		{620F56F7-F6DE-45D2-955D-912A22EE728A}.Unittest|Any CPU.Build.0 = Unittest|x64
+	EndGlobalSection
+EndGlobal
diff --git a/dlangui_msvc.sln b/dlangui-msvc.sln
similarity index 94%
rename from dlangui_msvc.sln
rename to dlangui-msvc.sln
index 38420d61..1df50262 100644
--- a/dlangui_msvc.sln
+++ b/dlangui-msvc.sln
@@ -3,29 +3,29 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dlangui", "dlangui_msvc.visualdproj", "{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}"
+Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dlangui", "dlangui-msvc.visualdproj", "{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}"
 EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "d3d", "examples\d3d\d3d_msvc.visualdproj", "{1C8C4726-B356-4533-90C7-88BDA875BF30}"
+Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "d3d", "examples\d3d\d3d-msvc.visualdproj", "{1C8C4726-B356-4533-90C7-88BDA875BF30}"
 	ProjectSection(ProjectDependencies) = postProject
 		{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5} = {52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}
 	EndProjectSection
 EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dmledit", "examples\dmledit\dmledit_msvc.visualdproj", "{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}"
+Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dmledit", "examples\dmledit\dmledit-msvc.visualdproj", "{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5} = {52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}
 	EndProjectSection
 EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "example1", "examples\example1\example1_msvc.visualdproj", "{B1CA031C-C195-4938-8F3E-8BFF7DA68933}"
+Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "example1", "examples\example1\example1-msvc.visualdproj", "{B1CA031C-C195-4938-8F3E-8BFF7DA68933}"
 	ProjectSection(ProjectDependencies) = postProject
 		{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5} = {52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}
 	EndProjectSection
 EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "helloworld", "examples\helloworld\helloworld_msvc.visualdproj", "{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}"
+Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "helloworld", "examples\helloworld\helloworld-msvc.visualdproj", "{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5} = {52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}
 	EndProjectSection
 EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "tetris", "examples\tetris\tetris_msvc.visualdproj", "{954B6A84-1EEC-42B0-B215-2A17842B1101}"
+Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "tetris", "examples\tetris\tetris-msvc.visualdproj", "{954B6A84-1EEC-42B0-B215-2A17842B1101}"
 	ProjectSection(ProjectDependencies) = postProject
 		{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5} = {52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}
 	EndProjectSection
diff --git a/dlangui_msvc.visualdproj b/dlangui-msvc.visualdproj
similarity index 80%
rename from dlangui_msvc.visualdproj
rename to dlangui-msvc.visualdproj
index 3a3db7ae..9753f885 100644
--- a/dlangui_msvc.visualdproj
+++ b/dlangui-msvc.visualdproj
@@ -72,7 +72,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources</versionids>
+  <versionids>Unicode  EmbedStandardResources ForceLogs</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
@@ -116,8 +116,8 @@
   <verbose>0</verbose>
   <vtls>0</vtls>
   <vgc>0</vgc>
-  <symdebug>0</symdebug>
-  <optimize>1</optimize>
+  <symdebug>1</symdebug>
+  <optimize>0</optimize>
   <cpu>0</cpu>
   <isX86_64>0</isX86_64>
   <isLinux>0</isLinux>
@@ -136,8 +136,8 @@
   <noboundscheck>0</noboundscheck>
   <useSwitchError>0</useSwitchError>
   <useUnitTests>0</useUnitTests>
-  <useInline>1</useInline>
-  <release>1</release>
+  <useInline>0</useInline>
+  <release>0</release>
   <preservePaths>0</preservePaths>
   <warnings>0</warnings>
   <infowarnings>0</infowarnings>
@@ -174,7 +174,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources</versionids>
+  <versionids>Unicode  EmbedStandardResources ForceLogs</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
@@ -276,7 +276,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources</versionids>
+  <versionids>Unicode  EmbedStandardResources ForceLogs</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
@@ -378,7 +378,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources</versionids>
+  <versionids>Unicode  EmbedStandardResources ForceLogs</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
@@ -411,76 +411,76 @@
  <Folder name="dlangui">
   <Folder name="3rdparty">
    <Folder name="DerelictFT">
-    <File path="..\DerelictFT\source\derelict\freetype\ft.d" />
-    <File path="..\DerelictFT\source\derelict\freetype\functions.d" />
-    <File path="..\DerelictFT\source\derelict\freetype\types.d" />
+    <File path="deps\DerelictFT\source\derelict\freetype\ft.d" />
+    <File path="deps\DerelictFT\source\derelict\freetype\functions.d" />
+    <File path="deps\DerelictFT\source\derelict\freetype\types.d" />
    </Folder>
    <Folder name="DerelictGL3">
-    <File path="..\DerelictGL3\source\derelict\opengl3\arb.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\cgl.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\constants.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\deprecatedConstants.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\deprecatedFunctions.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\ext.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\functions.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\gl.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\gl3.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\glx.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\glxext.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\internal.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\types.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\wgl.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\wglext.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\arb.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\cgl.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\constants.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\deprecatedConstants.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\deprecatedFunctions.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\ext.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\functions.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\gl.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\gl3.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\glx.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\glxext.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\internal.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\types.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\wgl.d" />
+    <File path="deps\DerelictGL3\source\derelict\opengl3\wglext.d" />
    </Folder>
    <Folder name="DerelictSDL2">
-    <File path="..\DerelictSDL2\source\derelict\sdl2\functions.d" />
-    <File path="..\DerelictSDL2\source\derelict\sdl2\image.d" />
-    <File path="..\DerelictSDL2\source\derelict\sdl2\mixer.d" />
-    <File path="..\DerelictSDL2\source\derelict\sdl2\net.d" />
-    <File path="..\DerelictSDL2\source\derelict\sdl2\sdl.d" />
-    <File path="..\DerelictSDL2\source\derelict\sdl2\ttf.d" />
-    <File path="..\DerelictSDL2\source\derelict\sdl2\types.d" />
+    <File path="deps\DerelictSDL2\source\derelict\sdl2\functions.d" />
+    <File path="deps\DerelictSDL2\source\derelict\sdl2\image.d" />
+    <File path="deps\DerelictSDL2\source\derelict\sdl2\mixer.d" />
+    <File path="deps\DerelictSDL2\source\derelict\sdl2\net.d" />
+    <File path="deps\DerelictSDL2\source\derelict\sdl2\sdl.d" />
+    <File path="deps\DerelictSDL2\source\derelict\sdl2\ttf.d" />
+    <File path="deps\DerelictSDL2\source\derelict\sdl2\types.d" />
    </Folder>
    <Folder name="DerelictUtil">
-    <File path="..\DerelictUtil\source\derelict\util\exception.d" />
-    <File path="..\DerelictUtil\source\derelict\util\loader.d" />
-    <File path="..\DerelictUtil\source\derelict\util\sharedlib.d" />
-    <File path="..\DerelictUtil\source\derelict\util\system.d" />
-    <File path="..\DerelictUtil\source\derelict\util\wintypes.d" />
-    <File path="..\DerelictUtil\source\derelict\util\xtypes.d" />
+    <File path="deps\DerelictUtil\source\derelict\util\exception.d" />
+    <File path="deps\DerelictUtil\source\derelict\util\loader.d" />
+    <File path="deps\DerelictUtil\source\derelict\util\sharedlib.d" />
+    <File path="deps\DerelictUtil\source\derelict\util\system.d" />
+    <File path="deps\DerelictUtil\source\derelict\util\wintypes.d" />
+    <File path="deps\DerelictUtil\source\derelict\util\xtypes.d" />
    </Folder>
-   <Folder name="dlib_image">
-    <File path="..\dlib\dlib\container\array.d" />
-    <File path="..\dlib\dlib\core\bitio.d" />
-    <File path="..\dlib\dlib\image\io\bmp.d" />
-    <File path="..\dlib\dlib\image\color.d" />
-    <File path="..\dlib\dlib\filesystem\windows\common.d" />
-    <File path="..\dlib\dlib\core\compound.d" />
-    <File path="..\dlib\dlib\math\decomposition.d" />
-    <File path="..\dlib\dlib\filesystem\delegaterange.d" />
-    <File path="..\dlib\dlib\filesystem\windows\directory.d" />
-    <File path="..\dlib\dlib\filesystem\dirrange.d" />
-    <File path="..\dlib\dlib\filesystem\windows\file.d" />
-    <File path="..\dlib\dlib\filesystem\filesystem.d" />
-    <File path="..\dlib\dlib\coding\huffman.d" />
-    <File path="..\dlib\dlib\image\io\idct.d" />
-    <File path="..\dlib\dlib\image\image.d" />
-    <File path="..\dlib\dlib\math\interpolation.d" />
-    <File path="..\dlib\dlib\image\io\io.d" />
-    <File path="..\dlib\dlib\image\io\jpeg.d" />
-    <File path="..\dlib\dlib\math\linsolve.d" />
-    <File path="..\dlib\dlib\filesystem\local.d" />
-    <File path="..\dlib\dlib\math\matrix.d" />
-    <File path="..\dlib\dlib\core\memory.d" />
-    <File path="..\dlib\dlib\image\io\png.d" />
-    <File path="..\dlib\dlib\functional\range.d" />
-    <File path="..\dlib\dlib\core\stream.d" />
-    <File path="..\dlib\dlib\image\io\tga.d" />
-    <File path="..\dlib\dlib\core\tuple.d" />
-    <File path="..\dlib\dlib\image\io\utils.d" />
-    <File path="..\dlib\dlib\math\utils.d" />
-    <File path="..\dlib\dlib\math\vector.d" />
-    <File path="..\dlib\dlib\coding\zlib.d" />
+   <Folder name="dlib">
+    <File path="deps\dlib\dlib\container\array.d" />
+    <File path="deps\dlib\dlib\core\bitio.d" />
+    <File path="deps\dlib\dlib\image\io\bmp.d" />
+    <File path="deps\dlib\dlib\image\color.d" />
+    <File path="deps\dlib\dlib\filesystem\windows\common.d" />
+    <File path="deps\dlib\dlib\core\compound.d" />
+    <File path="deps\dlib\dlib\math\decomposition.d" />
+    <File path="deps\dlib\dlib\filesystem\delegaterange.d" />
+    <File path="deps\dlib\dlib\filesystem\windows\directory.d" />
+    <File path="deps\dlib\dlib\filesystem\dirrange.d" />
+    <File path="deps\dlib\dlib\filesystem\windows\file.d" />
+    <File path="deps\dlib\dlib\filesystem\filesystem.d" />
+    <File path="deps\dlib\dlib\coding\huffman.d" />
+    <File path="deps\dlib\dlib\image\io\idct.d" />
+    <File path="deps\dlib\dlib\image\image.d" />
+    <File path="deps\dlib\dlib\math\interpolation.d" />
+    <File path="deps\dlib\dlib\image\io\io.d" />
+    <File path="deps\dlib\dlib\image\io\jpeg.d" />
+    <File path="deps\dlib\dlib\math\linsolve.d" />
+    <File path="deps\dlib\dlib\filesystem\local.d" />
+    <File path="deps\dlib\dlib\math\matrix.d" />
+    <File path="deps\dlib\dlib\core\memory.d" />
+    <File path="deps\dlib\dlib\image\io\png.d" />
+    <File path="deps\dlib\dlib\functional\range.d" />
+    <File path="deps\dlib\dlib\core\stream.d" />
+    <File path="deps\dlib\dlib\image\io\tga.d" />
+    <File path="deps\dlib\dlib\core\tuple.d" />
+    <File path="deps\dlib\dlib\image\io\utils.d" />
+    <File path="deps\dlib\dlib\math\utils.d" />
+    <File path="deps\dlib\dlib\math\vector.d" />
+    <File path="deps\dlib\dlib\coding\zlib.d" />
    </Folder>
    <Folder name="fontconfig">
     <File path="3rdparty\fontconfig\functions.d" />
@@ -488,13 +488,13 @@
     <File path="3rdparty\fontconfig\types.d" />
    </Folder>
    <Folder name="gl3n">
-    <File path="..\gl3n\gl3n\aabb.d" />
-    <File path="..\gl3n\gl3n\frustum.d" />
-    <File path="..\gl3n\gl3n\interpolate.d" />
-    <File path="..\gl3n\gl3n\linalg.d" />
-    <File path="..\gl3n\gl3n\math.d" />
-    <File path="..\gl3n\gl3n\plane.d" />
-    <File path="..\gl3n\gl3n\util.d" />
+    <File path="deps\gl3n\gl3n\aabb.d" />
+    <File path="deps\gl3n\gl3n\frustum.d" />
+    <File path="deps\gl3n\gl3n\interpolate.d" />
+    <File path="deps\gl3n\gl3n\linalg.d" />
+    <File path="deps\gl3n\gl3n\math.d" />
+    <File path="deps\gl3n\gl3n\plane.d" />
+    <File path="deps\gl3n\gl3n\util.d" />
    </Folder>
    <Folder name="win32">
     <File path="3rdparty\win32\basetsd.d" />
diff --git a/dlangui.sln b/dlangui.sln
deleted file mode 100644
index 49686615..00000000
--- a/dlangui.sln
+++ /dev/null
@@ -1,438 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-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
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "example1", "examples\example1\example1.visualdproj", "{68C78CC1-6176-4C60-B4B6-520475C26D23}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5FF17402-9997-4D0E-8068-6D84B8769D98} = {5FF17402-9997-4D0E-8068-6D84B8769D98}
-	EndProjectSection
-EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "helloworld", "examples\helloworld\helloworld.visualdproj", "{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5FF17402-9997-4D0E-8068-6D84B8769D98} = {5FF17402-9997-4D0E-8068-6D84B8769D98}
-	EndProjectSection
-EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dlangide", "..\dlangide\dlangide.visualdproj", "{66B1B701-6AC9-41F5-8DB4-5CB161321977}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5FF17402-9997-4D0E-8068-6D84B8769D98} = {5FF17402-9997-4D0E-8068-6D84B8769D98}
-		{C4F86459-686F-4841-A6BE-7FCC38DC47FE} = {C4F86459-686F-4841-A6BE-7FCC38DC47FE}
-	EndProjectSection
-EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "tetris", "examples\tetris\tetris.visualdproj", "{68C78CAD-6176-4C60-B4A5-520475C26D56}"
-EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "libdparse", "..\dlangide\libdparse\libdparse.visualdproj", "{C4F86459-686F-4841-A6BE-7FCC38DC47FE}"
-EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dlanguisfml", "..\dsfml_project\dlanguisfml\dlanguisfml.visualdproj", "{5867E363-515A-4C7E-82C7-D1C1D35F55FC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5FF17402-9997-4D0E-8068-6D84B8769D98} = {5FF17402-9997-4D0E-8068-6D84B8769D98}
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA} = {DB490C05-D9F8-431C-91DD-CEE646A64FDA}
-	EndProjectSection
-EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dsfml", "..\DSFML\dsfml\dsfml.visualdproj", "{DB490C05-D9F8-431C-91DD-CEE646A64FDA}"
-EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dmledit", "examples\dmledit\dmledit.visualdproj", "{06D73450-2919-48A8-B2C3-738B12505D74}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5FF17402-9997-4D0E-8068-6D84B8769D98} = {5FF17402-9997-4D0E-8068-6D84B8769D98}
-	EndProjectSection
-EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "d3d", "examples\d3d\d3d.visualdproj", "{55B79469-E5D8-4B58-89BD-5A3E11A696B0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5FF17402-9997-4D0E-8068-6D84B8769D98} = {5FF17402-9997-4D0E-8068-6D84B8769D98}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug COFF32|Any CPU = Debug COFF32|Any CPU
-		Debug COFF32|Mixed Platforms = Debug COFF32|Mixed Platforms
-		Debug COFF32|Win32 = Debug COFF32|Win32
-		Debug COFF32|x64 = Debug COFF32|x64
-		Debug GDC|Any CPU = Debug GDC|Any CPU
-		Debug GDC|Mixed Platforms = Debug GDC|Mixed Platforms
-		Debug GDC|Win32 = Debug GDC|Win32
-		Debug GDC|x64 = Debug GDC|x64
-		Debug LDC|Any CPU = Debug LDC|Any CPU
-		Debug LDC|Mixed Platforms = Debug LDC|Mixed Platforms
-		Debug LDC|Win32 = Debug LDC|Win32
-		Debug LDC|x64 = Debug LDC|x64
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		TestDebug|Any CPU = TestDebug|Any CPU
-		TestDebug|Mixed Platforms = TestDebug|Mixed Platforms
-		TestDebug|Win32 = TestDebug|Win32
-		TestDebug|x64 = TestDebug|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug COFF32|Any CPU.ActiveCfg = Debug|Win32
-		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug COFF32|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug COFF32|Mixed Platforms.Build.0 = Debug|Win32
-		{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|Any CPU.ActiveCfg = Debug|Win32
-		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug GDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug GDC|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug LDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug LDC|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Release|Win32
-		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Release|Mixed Platforms.Build.0 = Release|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|Any CPU.ActiveCfg = Debug|Win32
-		{5FF17402-9997-4D0E-8068-6D84B8769D98}.TestDebug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5FF17402-9997-4D0E-8068-6D84B8769D98}.TestDebug|Mixed Platforms.Build.0 = Debug|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|Any CPU.ActiveCfg = Debug|Win32
-		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug COFF32|Mixed Platforms.ActiveCfg = Debug|Win32
-		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug COFF32|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug GDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug GDC|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug LDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug LDC|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Release|Win32
-		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Release|Mixed Platforms.Build.0 = Release|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|Any CPU.ActiveCfg = Debug|Win32
-		{68C78CC1-6176-4C60-B4B6-520475C26D23}.TestDebug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{68C78CC1-6176-4C60-B4B6-520475C26D23}.TestDebug|Mixed Platforms.Build.0 = Debug|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|Any CPU.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug COFF32|Mixed Platforms.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug COFF32|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug GDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug GDC|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug LDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug LDC|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Release|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Release|Mixed Platforms.Build.0 = Release|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|Any CPU.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.TestDebug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.TestDebug|Mixed Platforms.Build.0 = Debug|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|Any CPU.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug COFF32|Mixed Platforms.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug COFF32|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug GDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug GDC|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug LDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug LDC|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Release|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Release|Mixed Platforms.Build.0 = Release|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|Any CPU.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.TestDebug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.TestDebug|Mixed Platforms.Build.0 = Debug|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|Any CPU.ActiveCfg = Debug|Win32
-		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug COFF32|Mixed Platforms.ActiveCfg = Debug|Win32
-		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug COFF32|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug GDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug GDC|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug LDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug LDC|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Release|Win32
-		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Release|Mixed Platforms.Build.0 = Release|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|Any CPU.ActiveCfg = Debug|Win32
-		{68C78CAD-6176-4C60-B4A5-520475C26D56}.TestDebug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{68C78CAD-6176-4C60-B4A5-520475C26D56}.TestDebug|Mixed Platforms.Build.0 = Debug|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|Any CPU.ActiveCfg = Debug|Win32
-		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug COFF32|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug COFF32|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug GDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug GDC|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug LDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug LDC|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Debug|Win32
-		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Release|Win32
-		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Release|Mixed Platforms.Build.0 = Release|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|Any CPU.ActiveCfg = Debug|Win32
-		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.TestDebug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.TestDebug|Mixed Platforms.Build.0 = Debug|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
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug COFF32|Any CPU.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug COFF32|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug COFF32|Mixed Platforms.Build.0 = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug COFF32|Win32.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug COFF32|Win32.Build.0 = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug COFF32|x64.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug GDC|Any CPU.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug GDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug GDC|Mixed Platforms.Build.0 = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug GDC|Win32.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug GDC|Win32.Build.0 = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug GDC|x64.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug LDC|Any CPU.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug LDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug LDC|Mixed Platforms.Build.0 = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug LDC|Win32.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug LDC|Win32.Build.0 = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug LDC|x64.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug|Win32.Build.0 = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Debug|x64.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Release|Any CPU.ActiveCfg = Release|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Release|Win32.ActiveCfg = Release|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Release|Win32.Build.0 = Release|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.Release|x64.ActiveCfg = Release|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.TestDebug|Any CPU.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.TestDebug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.TestDebug|Mixed Platforms.Build.0 = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.TestDebug|Win32.ActiveCfg = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.TestDebug|Win32.Build.0 = Debug|Win32
-		{5867E363-515A-4C7E-82C7-D1C1D35F55FC}.TestDebug|x64.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug COFF32|Any CPU.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug COFF32|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug COFF32|Mixed Platforms.Build.0 = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug COFF32|Win32.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug COFF32|Win32.Build.0 = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug COFF32|x64.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug GDC|Any CPU.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug GDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug GDC|Mixed Platforms.Build.0 = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug GDC|Win32.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug GDC|Win32.Build.0 = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug GDC|x64.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug LDC|Any CPU.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug LDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug LDC|Mixed Platforms.Build.0 = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug LDC|Win32.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug LDC|Win32.Build.0 = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug LDC|x64.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug|Win32.Build.0 = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Debug|x64.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Release|Any CPU.ActiveCfg = Release|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Release|Win32.ActiveCfg = Release|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Release|Win32.Build.0 = Release|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.Release|x64.ActiveCfg = Release|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.TestDebug|Any CPU.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.TestDebug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.TestDebug|Mixed Platforms.Build.0 = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.TestDebug|Win32.ActiveCfg = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.TestDebug|Win32.Build.0 = Debug|Win32
-		{DB490C05-D9F8-431C-91DD-CEE646A64FDA}.TestDebug|x64.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug COFF32|Any CPU.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug COFF32|Mixed Platforms.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug COFF32|Mixed Platforms.Build.0 = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug COFF32|Win32.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug COFF32|Win32.Build.0 = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug COFF32|x64.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug GDC|Any CPU.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug GDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug GDC|Mixed Platforms.Build.0 = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug GDC|Win32.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug GDC|Win32.Build.0 = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug GDC|x64.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug LDC|Any CPU.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug LDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug LDC|Mixed Platforms.Build.0 = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug LDC|Win32.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug LDC|Win32.Build.0 = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug LDC|x64.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug|Win32.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug|Win32.Build.0 = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Debug|x64.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Release|Any CPU.ActiveCfg = Release|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Release|Win32.ActiveCfg = Release|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Release|Win32.Build.0 = Release|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.Release|x64.ActiveCfg = Release|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.TestDebug|Any CPU.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.TestDebug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.TestDebug|Mixed Platforms.Build.0 = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.TestDebug|Win32.ActiveCfg = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.TestDebug|Win32.Build.0 = Debug|Win32
-		{06D73450-2919-48A8-B2C3-738B12505D74}.TestDebug|x64.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug COFF32|Any CPU.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug COFF32|Mixed Platforms.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug COFF32|Mixed Platforms.Build.0 = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug COFF32|Win32.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug COFF32|Win32.Build.0 = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug COFF32|x64.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug GDC|Any CPU.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug GDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug GDC|Mixed Platforms.Build.0 = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug GDC|Win32.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug GDC|Win32.Build.0 = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug GDC|x64.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug LDC|Any CPU.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug LDC|Mixed Platforms.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug LDC|Mixed Platforms.Build.0 = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug LDC|Win32.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug LDC|Win32.Build.0 = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug LDC|x64.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug|Win32.Build.0 = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Debug|x64.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Release|Any CPU.ActiveCfg = Release|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Release|Win32.ActiveCfg = Release|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Release|Win32.Build.0 = Release|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.Release|x64.ActiveCfg = Release|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.TestDebug|Any CPU.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.TestDebug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.TestDebug|Mixed Platforms.Build.0 = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.TestDebug|Win32.ActiveCfg = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.TestDebug|Win32.Build.0 = Debug|Win32
-		{55B79469-E5D8-4B58-89BD-5A3E11A696B0}.TestDebug|x64.ActiveCfg = Debug|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/dlanguilib-win32.dproj b/dlanguilib-win32.dproj
deleted file mode 100644
index de63abc1..00000000
--- a/dlanguilib-win32.dproj
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}</ProjectGuid>
-    <UseDefaultCompiler>true</UseDefaultCompiler>
-    <IncrementalLinking>true</IncrementalLinking>
-    <PreferOneStepBuild>true</PreferOneStepBuild>
-    <Compiler>DMD2</Compiler>
-    <Includes>
-      <Includes>
-        <Path>\home\lve\src\d\DerelictFT\source</Path>
-        <Path>\home\lve\src\d\DerelictGL3\source</Path>
-        <Path>\home\lve\src\d\DerelictUtil\source</Path>
-        <Path>\home\lve\src\d\dlangui\3rdparty\X11</Path>
-        <Path>\home\lve\src\d\dlangui\3rdparty\X11\xcb</Path>
-      </Includes>
-    </Includes>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug</OutputPath>
-    <OutputName>dlanguilib</OutputName>
-    <ObjectsDirectory>obj/Debug</ObjectsDirectory>
-    <Externalconsole>true</Externalconsole>
-    <Target>StaticLibrary</Target>
-    <UnittestMode>false</UnittestMode>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
-    <DebugLevel>0</DebugLevel>
-    <VersionIds>
-      <VersionIds>
-        <String>USE_OPENGL</String>
-        <String>USE_SDL</String>
-      </VersionIds>
-    </VersionIds>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release</OutputPath>
-    <OutputName>dlanguilib</OutputName>
-    <ObjectsDirectory>obj/Release</ObjectsDirectory>
-    <Externalconsole>true</Externalconsole>
-    <Target>StaticLibrary</Target>
-    <ExtraCompilerArguments>-version=USE_OPENGL</ExtraCompilerArguments>
-    <UnittestMode>false</UnittestMode>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
-    <DebugLevel>0</DebugLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Unittest</OutputPath>
-    <ExtraCompilerArguments>-unittest </ExtraCompilerArguments>
-    <ObjectsDirectory>obj/Unittest</ObjectsDirectory>
-    <OutputName>dlanguilib</OutputName>
-    <Externalconsole>true</Externalconsole>
-    <Target>StaticLibrary</Target>
-    <UnittestMode>false</UnittestMode>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
-    <DebugLevel>0</DebugLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="src\dlangui\core\logger.d" />
-    <Compile Include="src\dlangui\core\types.d" />
-    <Compile Include="src\dlangui\graphics\drawbuf.d" />
-    <Compile Include="src\dlangui\graphics\fonts.d" />
-    <Compile Include="src\dlangui\graphics\ftfonts.d" />
-    <Compile Include="src\dlangui\graphics\gldrawbuf.d" />
-    <Compile Include="src\dlangui\graphics\glsupport.d" />
-    <Compile Include="src\dlangui\graphics\images.d" />
-    <Compile Include="src\dlangui\platforms\common\platform.d" />
-    <Compile Include="src\dlangui\widgets\controls.d" />
-    <Compile Include="src\dlangui\widgets\layouts.d" />
-    <Compile Include="src\dlangui\widgets\styles.d" />
-    <Compile Include="src\dlangui\widgets\widget.d" />
-    <Compile Include="..\DerelictFT\source\derelict\freetype\ft.d">
-      <Link>3rdparty\DerelictFT\ft.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictFT\source\derelict\freetype\functions.d">
-      <Link>3rdparty\DerelictFT\functions.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictFT\source\derelict\freetype\types.d">
-      <Link>3rdparty\DerelictFT\types.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\arb.d">
-      <Link>3rdparty\DerelictGL3\arb.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\cgl.d">
-      <Link>3rdparty\DerelictGL3\cgl.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\constants.d">
-      <Link>3rdparty\DerelictGL3\constants.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\deprecatedConstants.d">
-      <Link>3rdparty\DerelictGL3\deprecatedConstants.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\deprecatedFunctions.d">
-      <Link>3rdparty\DerelictGL3\deprecatedFunctions.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\ext.d">
-      <Link>3rdparty\DerelictGL3\ext.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\functions.d">
-      <Link>3rdparty\DerelictGL3\functions.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\gl.d">
-      <Link>3rdparty\DerelictGL3\gl.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\gl3.d">
-      <Link>3rdparty\DerelictGL3\gl3.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\glx.d">
-      <Link>3rdparty\DerelictGL3\glx.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\glxext.d">
-      <Link>3rdparty\DerelictGL3\glxext.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\internal.d">
-      <Link>3rdparty\DerelictGL3\internal.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\types.d">
-      <Link>3rdparty\DerelictGL3\types.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\wgl.d">
-      <Link>3rdparty\DerelictGL3\wgl.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\wglext.d">
-      <Link>3rdparty\DerelictGL3\wglext.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictUtil\source\derelict\util\exception.d">
-      <Link>3rdparty\DerelictUtil\exception.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictUtil\source\derelict\util\loader.d">
-      <Link>3rdparty\DerelictUtil\loader.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictUtil\source\derelict\util\sharedlib.d">
-      <Link>3rdparty\DerelictUtil\sharedlib.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictUtil\source\derelict\util\system.d">
-      <Link>3rdparty\DerelictUtil\system.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictUtil\source\derelict\util\wintypes.d">
-      <Link>3rdparty\DerelictUtil\wintypes.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictUtil\source\derelict\util\xtypes.d">
-      <Link>3rdparty\DerelictUtil\xtypes.d</Link>
-    </Compile>
-    <Compile Include="src\dlangui\all.d" />
-    <Compile Include="src\dlangui\core\events.d" />
-    <Compile Include="..\DerelictFI\source\derelict\freeimage\freeimage.d">
-      <Link>3rdparty\DerelictFI\freeimage.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictFI\source\derelict\freeimage\functions.d">
-      <Link>3rdparty\DerelictFI\functions.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictFI\source\derelict\freeimage\types.d">
-      <Link>3rdparty\DerelictFI\types.d</Link>
-    </Compile>
-    <Compile Include="src\dlangui\core\i18n.d" />
-    <Compile Include="src\dlangui\core\linestream.d" />
-    <Compile Include="src\dlangui\widgets\lists.d" />
-    <Compile Include="src\dlangui\widgets\tabs.d" />
-    <Compile Include="src\dlangui\graphics\resources.d" />
-    <Compile Include="src\dlangui\widgets\menu.d" />
-    <Compile Include="src\dlangui\widgets\popup.d" />
-    <Compile Include="src\dlangui\core\collections.d" />
-    <Compile Include="src\dlangui\core\signals.d" />
-    <Compile Include="src\dlangui\widgets\editors.d" />
-    <Compile Include="src\dlangui\platforms\sdl\sdlapp.d" />
-    <Compile Include="..\DerelictSDL2\source\derelict\sdl2\functions.d">
-      <Link>3rdparty\FreetypeSDL2\functions.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictSDL2\source\derelict\sdl2\image.d">
-      <Link>3rdparty\FreetypeSDL2\image.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictSDL2\source\derelict\sdl2\mixer.d">
-      <Link>3rdparty\FreetypeSDL2\mixer.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictSDL2\source\derelict\sdl2\net.d">
-      <Link>3rdparty\FreetypeSDL2\net.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictSDL2\source\derelict\sdl2\sdl.d">
-      <Link>3rdparty\FreetypeSDL2\sdl.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictSDL2\source\derelict\sdl2\ttf.d">
-      <Link>3rdparty\FreetypeSDL2\ttf.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictSDL2\source\derelict\sdl2\types.d">
-      <Link>3rdparty\FreetypeSDL2\types.d</Link>
-    </Compile>
-    <Compile Include="src\dlangui\widgets\grid.d" />
-    <Compile Include="3rdparty\win32\w32api.d" />
-    <Compile Include="3rdparty\win32\winbase.d" />
-    <Compile Include="3rdparty\win32\windef.d" />
-    <Compile Include="3rdparty\win32\windows.d" />
-    <Compile Include="3rdparty\win32\cderr.d" />
-    <Compile Include="3rdparty\win32\core.d" />
-    <Compile Include="3rdparty\win32\dde.d" />
-    <Compile Include="3rdparty\win32\ddeml.d" />
-    <Compile Include="3rdparty\win32\dlgs.d" />
-    <Compile Include="3rdparty\win32\imm.d" />
-    <Compile Include="3rdparty\win32\lzexpand.d" />
-    <Compile Include="3rdparty\win32\nb30.d" />
-    <Compile Include="3rdparty\win32\winsvc.d" />
-    <Compile Include="3rdparty\win32\commdlg.d" />
-    <Compile Include="3rdparty\win32\ole2.d" />
-    <Compile Include="3rdparty\win32\rpc.d" />
-    <Compile Include="3rdparty\win32\shellapi.d" />
-    <Compile Include="3rdparty\win32\winperf.d" />
-    <Compile Include="3rdparty\win32\winspool.d" />
-    <Compile Include="3rdparty\win32\winnt.d" />
-    <Compile Include="3rdparty\win32\basetsd.d" />
-    <Compile Include="3rdparty\win32\winerror.d" />
-    <Compile Include="3rdparty\win32\basetyps.d" />
-    <Compile Include="3rdparty\win32\wincon.d" />
-    <Compile Include="3rdparty\win32\wingdi.d" />
-    <Compile Include="3rdparty\win32\winnetwk.d" />
-    <Compile Include="3rdparty\win32\winnls.d" />
-    <Compile Include="3rdparty\win32\winuser.d" />
-    <Compile Include="3rdparty\win32\winver.d" />
-    <Compile Include="3rdparty\win32\mmsystem.d" />
-    <Compile Include="3rdparty\win32\unknwn.d" />
-    <Compile Include="3rdparty\win32\rpcdce.d" />
-    <Compile Include="3rdparty\win32\rpcnsi.d" />
-    <Compile Include="3rdparty\win32\rpcnterr.d" />
-    <Compile Include="3rdparty\win32\objfwd.d" />
-    <Compile Include="3rdparty\win32\wtypes.d" />
-    <Compile Include="3rdparty\win32\objidl.d" />
-    <Compile Include="3rdparty\win32\oleidl.d" />
-    <Compile Include="3rdparty\win32\rpcndr.d" />
-    <Compile Include="3rdparty\win32\uuid.d" />
-    <Compile Include="3rdparty\win32\rpcnsip.d" />
-    <Compile Include="3rdparty\win32\rpcdcep.d" />
-    <Compile Include="3rdparty\win32\objbase.d" />
-    <Compile Include="3rdparty\win32\oleauto.d" />
-    <Compile Include="3rdparty\win32\olectlid.d" />
-    <Compile Include="3rdparty\win32\cguid.d" />
-    <Compile Include="3rdparty\win32\oaidl.d" />
-    <Compile Include="3rdparty\win32\winsock2.d" />
-    <Compile Include="3rdparty\win32\ws2tcpip.d" />
-    <Compile Include="src\dlangui\platforms\windows\win32drawbuf.d" />
-    <Compile Include="src\dlangui\platforms\windows\win32fonts.d" />
-    <Compile Include="src\dlangui\platforms\windows\winapp.d" />
-    <Compile Include="3rdparty\win32\prsht.d" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="src\dlangui\platforms\x11\" />
-    <Folder Include="3rdparty\DerelictUtil\" />
-    <Folder Include="3rdparty\DerelictGL3\" />
-    <Folder Include="3rdparty\DerelictFT\" />
-    <Folder Include="3rdparty\DerelictFI\" />
-    <Folder Include="3rdparty\FreetypeSDL2\" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/dlanguilib.dproj b/dlanguilib.dproj
deleted file mode 100644
index 225f39d6..00000000
--- a/dlanguilib.dproj
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}</ProjectGuid>
-    <UseDefaultCompiler>true</UseDefaultCompiler>
-    <IncrementalLinking>true</IncrementalLinking>
-    <PreferOneStepBuild>true</PreferOneStepBuild>
-    <Compiler>DMD2</Compiler>
-    <Includes>
-      <Includes>
-        <Path>\home\lve\src\d\DerelictFT\source</Path>
-        <Path>\home\lve\src\d\DerelictGL3\source</Path>
-        <Path>\home\lve\src\d\DerelictUtil\source</Path>
-        <Path>\home\lve\src\d\dlangui\3rdparty\X11</Path>
-        <Path>\home\lve\src\d\dlangui\3rdparty\X11\xcb</Path>
-      </Includes>
-    </Includes>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug</OutputPath>
-    <OutputName>dlanguilib</OutputName>
-    <ObjectsDirectory>obj/Debug</ObjectsDirectory>
-    <Externalconsole>true</Externalconsole>
-    <Target>StaticLibrary</Target>
-    <UnittestMode>false</UnittestMode>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
-    <DebugLevel>0</DebugLevel>
-    <VersionIds>
-      <VersionIds>
-        <String>USE_OPENGL</String>
-        <String>USE_SDL</String>
-      </VersionIds>
-    </VersionIds>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release</OutputPath>
-    <OutputName>dlanguilib</OutputName>
-    <ObjectsDirectory>obj/Release</ObjectsDirectory>
-    <Externalconsole>true</Externalconsole>
-    <Target>StaticLibrary</Target>
-    <ExtraCompilerArguments>-version=USE_OPENGL</ExtraCompilerArguments>
-    <UnittestMode>false</UnittestMode>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
-    <DebugLevel>0</DebugLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Unittest</OutputPath>
-    <ExtraCompilerArguments>-unittest </ExtraCompilerArguments>
-    <ObjectsDirectory>obj/Unittest</ObjectsDirectory>
-    <OutputName>dlanguilib</OutputName>
-    <Externalconsole>true</Externalconsole>
-    <Target>StaticLibrary</Target>
-    <UnittestMode>false</UnittestMode>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
-    <DebugLevel>0</DebugLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="src\dlangui\core\logger.d" />
-    <Compile Include="src\dlangui\core\types.d" />
-    <Compile Include="src\dlangui\graphics\drawbuf.d" />
-    <Compile Include="src\dlangui\graphics\fonts.d" />
-    <Compile Include="src\dlangui\graphics\ftfonts.d" />
-    <Compile Include="src\dlangui\graphics\gldrawbuf.d" />
-    <Compile Include="src\dlangui\graphics\glsupport.d" />
-    <Compile Include="src\dlangui\graphics\images.d" />
-    <Compile Include="src\dlangui\platforms\common\platform.d" />
-    <Compile Include="src\dlangui\widgets\controls.d" />
-    <Compile Include="src\dlangui\widgets\layouts.d" />
-    <Compile Include="src\dlangui\widgets\styles.d" />
-    <Compile Include="src\dlangui\widgets\widget.d" />
-    <Compile Include="src\dlangui\platforms\x11\x11app.d" />
-    <Compile Include="..\DerelictFT\source\derelict\freetype\ft.d">
-      <Link>3rdparty\DerelictFT\ft.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictFT\source\derelict\freetype\functions.d">
-      <Link>3rdparty\DerelictFT\functions.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictFT\source\derelict\freetype\types.d">
-      <Link>3rdparty\DerelictFT\types.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\arb.d">
-      <Link>3rdparty\DerelictGL3\arb.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\cgl.d">
-      <Link>3rdparty\DerelictGL3\cgl.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\constants.d">
-      <Link>3rdparty\DerelictGL3\constants.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\deprecatedConstants.d">
-      <Link>3rdparty\DerelictGL3\deprecatedConstants.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\deprecatedFunctions.d">
-      <Link>3rdparty\DerelictGL3\deprecatedFunctions.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\ext.d">
-      <Link>3rdparty\DerelictGL3\ext.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\functions.d">
-      <Link>3rdparty\DerelictGL3\functions.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\gl.d">
-      <Link>3rdparty\DerelictGL3\gl.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\gl3.d">
-      <Link>3rdparty\DerelictGL3\gl3.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\glx.d">
-      <Link>3rdparty\DerelictGL3\glx.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\glxext.d">
-      <Link>3rdparty\DerelictGL3\glxext.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\internal.d">
-      <Link>3rdparty\DerelictGL3\internal.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\types.d">
-      <Link>3rdparty\DerelictGL3\types.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\wgl.d">
-      <Link>3rdparty\DerelictGL3\wgl.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictGL3\source\derelict\opengl3\wglext.d">
-      <Link>3rdparty\DerelictGL3\wglext.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictUtil\source\derelict\util\exception.d">
-      <Link>3rdparty\DerelictUtil\exception.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictUtil\source\derelict\util\loader.d">
-      <Link>3rdparty\DerelictUtil\loader.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictUtil\source\derelict\util\sharedlib.d">
-      <Link>3rdparty\DerelictUtil\sharedlib.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictUtil\source\derelict\util\system.d">
-      <Link>3rdparty\DerelictUtil\system.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictUtil\source\derelict\util\wintypes.d">
-      <Link>3rdparty\DerelictUtil\wintypes.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictUtil\source\derelict\util\xtypes.d">
-      <Link>3rdparty\DerelictUtil\xtypes.d</Link>
-    </Compile>
-    <Compile Include="src\dlangui\all.d" />
-    <Compile Include="3rdparty\X11\xcb\bigreq.d" />
-    <Compile Include="3rdparty\X11\xcb\composite.d" />
-    <Compile Include="3rdparty\X11\xcb\damage.d" />
-    <Compile Include="3rdparty\X11\xcb\dpms.d" />
-    <Compile Include="3rdparty\X11\xcb\glx.d" />
-    <Compile Include="3rdparty\X11\xcb\randr.d" />
-    <Compile Include="3rdparty\X11\xcb\record.d" />
-    <Compile Include="3rdparty\X11\xcb\render.d" />
-    <Compile Include="3rdparty\X11\xcb\res.d" />
-    <Compile Include="3rdparty\X11\xcb\screensaver.d" />
-    <Compile Include="3rdparty\X11\xcb\shape.d" />
-    <Compile Include="3rdparty\X11\xcb\shm.d" />
-    <Compile Include="3rdparty\X11\xcb\xcb.d" />
-    <Compile Include="3rdparty\X11\xcb\xc_misc.d" />
-    <Compile Include="3rdparty\X11\xcb\xevie.d" />
-    <Compile Include="3rdparty\X11\xcb\xf86dri.d" />
-    <Compile Include="3rdparty\X11\xcb\xfixes.d" />
-    <Compile Include="3rdparty\X11\xcb\xinerama.d" />
-    <Compile Include="3rdparty\X11\xcb\xprint.d" />
-    <Compile Include="3rdparty\X11\xcb\xproto.d" />
-    <Compile Include="3rdparty\X11\xcb\xtest.d" />
-    <Compile Include="3rdparty\X11\xcb\xv.d" />
-    <Compile Include="3rdparty\X11\xcb\xvmc.d" />
-    <Compile Include="3rdparty\X11\keysymdef.d" />
-    <Compile Include="3rdparty\X11\xcb\image.d" />
-    <Compile Include="src\dlangui\core\events.d" />
-    <Compile Include="..\DerelictFI\source\derelict\freeimage\freeimage.d">
-      <Link>3rdparty\DerelictFI\freeimage.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictFI\source\derelict\freeimage\functions.d">
-      <Link>3rdparty\DerelictFI\functions.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictFI\source\derelict\freeimage\types.d">
-      <Link>3rdparty\DerelictFI\types.d</Link>
-    </Compile>
-    <Compile Include="3rdparty\X11\X.d" />
-    <Compile Include="3rdparty\X11\Xlib.d" />
-    <Compile Include="src\dlangui\core\i18n.d" />
-    <Compile Include="src\dlangui\core\linestream.d" />
-    <Compile Include="src\dlangui\widgets\lists.d" />
-    <Compile Include="src\dlangui\widgets\tabs.d" />
-    <Compile Include="src\dlangui\graphics\resources.d" />
-    <Compile Include="src\dlangui\widgets\menu.d" />
-    <Compile Include="src\dlangui\widgets\popup.d" />
-    <Compile Include="src\dlangui\core\collections.d" />
-    <Compile Include="src\dlangui\core\signals.d" />
-    <Compile Include="src\dlangui\widgets\editors.d" />
-    <Compile Include="src\dlangui\platforms\sdl\sdlapp.d" />
-    <Compile Include="..\DerelictSDL2\source\derelict\sdl2\functions.d">
-      <Link>3rdparty\FreetypeSDL2\functions.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictSDL2\source\derelict\sdl2\image.d">
-      <Link>3rdparty\FreetypeSDL2\image.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictSDL2\source\derelict\sdl2\mixer.d">
-      <Link>3rdparty\FreetypeSDL2\mixer.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictSDL2\source\derelict\sdl2\net.d">
-      <Link>3rdparty\FreetypeSDL2\net.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictSDL2\source\derelict\sdl2\sdl.d">
-      <Link>3rdparty\FreetypeSDL2\sdl.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictSDL2\source\derelict\sdl2\ttf.d">
-      <Link>3rdparty\FreetypeSDL2\ttf.d</Link>
-    </Compile>
-    <Compile Include="..\DerelictSDL2\source\derelict\sdl2\types.d">
-      <Link>3rdparty\FreetypeSDL2\types.d</Link>
-    </Compile>
-    <Compile Include="src\dlangui\widgets\grid.d" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="src\dlangui\platforms\x11\" />
-    <Folder Include="3rdparty\DerelictUtil\" />
-    <Folder Include="3rdparty\DerelictGL3\" />
-    <Folder Include="3rdparty\DerelictFT\" />
-    <Folder Include="3rdparty\DerelictFI\" />
-    <Folder Include="3rdparty\FreetypeSDL2\" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/dlanguilib.sln b/dlanguilib.sln
deleted file mode 100644
index 24a1a947..00000000
--- a/dlanguilib.sln
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dlangui", "dlanguilib.visualdproj", "{5FF17402-9997-4D0E-8068-6D84B8769D98}"
-EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "example1", "examples\example1\example1.visualdproj", "{68C78CC1-6176-4C60-B4B6-520475C26D23}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5FF17402-9997-4D0E-8068-6D84B8769D98} = {5FF17402-9997-4D0E-8068-6D84B8769D98}
-	EndProjectSection
-EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "test", "examples\test\test.visualdproj", "{BE84DF39-64E6-449D-89E0-8E92404003CB}"
-EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "helloworld", "examples\helloworld\helloworld.visualdproj", "{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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}.Release|Win32.ActiveCfg = Release|Win32
-		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Release|Win32.Build.0 = Release|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}.Release|Win32.ActiveCfg = Release|Win32
-		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Release|Win32.Build.0 = Release|Win32
-		{BE84DF39-64E6-449D-89E0-8E92404003CB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BE84DF39-64E6-449D-89E0-8E92404003CB}.Debug|Win32.Build.0 = Debug|Win32
-		{BE84DF39-64E6-449D-89E0-8E92404003CB}.Release|Win32.ActiveCfg = Release|Win32
-		{BE84DF39-64E6-449D-89E0-8E92404003CB}.Release|Win32.Build.0 = Release|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}.Release|Win32.ActiveCfg = Release|Win32
-		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/dlanguilib.visualdproj b/dlanguilib.visualdproj
deleted file mode 100644
index 79447cfe..00000000
--- a/dlanguilib.visualdproj
+++ /dev/null
@@ -1,463 +0,0 @@
-<DProject>
- <ProjectGuid>{5FF17402-9997-4D0E-8068-6D84B8769D98}</ProjectGuid>
- <Config name="Debug" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>1</lib>
-  <subsystem>2</subsystem>
-  <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>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>0</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <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>$(SolutionDir)/../dlangui/3rdparty $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath>$(SolutionDir)/../dlangui/views $(SolutionDir)/../dlangui/views/res $(SolutionDir)/../dlangui/views/res/i18n $(SolutionDir)/../dlangui/views/res/mdpi  $(SolutionDir)/../dlangui/views/res/hdpi</fileImppath>
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir>docs</docdir>
-  <docname>docs/index.html</docname>
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir>include</hdrdir>
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids>DebugFocus FontResources</debugids>
-  <versionlevel>0</versionlevel>
-  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources</versionids>
-  <dump_source>0</dump_source>
-  <mapverbosity>0</mapverbosity>
-  <createImplib>1</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>1</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles />
-  <libpaths />
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).lib</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <cRuntime>2</cRuntime>
-  <privatePhobos>0</privatePhobos>
-  <additionalOptions />
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Config name="Release" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>1</lib>
-  <subsystem>0</subsystem>
-  <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>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>1</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <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>$(SolutionDir)/../dlangui/3rdparty $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath>$(SolutionDir)/../dlangui/views $(SolutionDir)/../dlangui/views/res $(SolutionDir)/../dlangui/views/res/i18n $(SolutionDir)/../dlangui/views/res/mdpi  $(SolutionDir)/../dlangui/views/res/hdpi</fileImppath>
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids />
-  <versionlevel>0</versionlevel>
-  <versionids>EmbedStandardResources Unicode USE_FREETYPE</versionids>
-  <dump_source>0</dump_source>
-  <mapverbosity>0</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>0</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles />
-  <libpaths />
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).lib</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <cRuntime>1</cRuntime>
-  <privatePhobos>0</privatePhobos>
-  <additionalOptions />
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Folder name="dlangui">
-  <Folder name="3rdparty">
-   <Folder name="DerelictFT">
-    <File path="..\DerelictFT\source\derelict\freetype\ft.d" />
-    <File path="..\DerelictFT\source\derelict\freetype\functions.d" />
-    <File path="..\DerelictFT\source\derelict\freetype\types.d" />
-   </Folder>
-   <Folder name="DerelictGL3">
-    <File path="..\DerelictGL3\source\derelict\opengl3\arb.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\cgl.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\constants.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\deprecatedConstants.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\deprecatedFunctions.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\ext.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\functions.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\gl.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\gl3.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\glx.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\glxext.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\internal.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\types.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\wgl.d" />
-    <File path="..\DerelictGL3\source\derelict\opengl3\wglext.d" />
-   </Folder>
-   <Folder name="DerelictSDL2">
-    <File path="..\DerelictSDL2\source\derelict\sdl2\functions.d" />
-    <File path="..\DerelictSDL2\source\derelict\sdl2\image.d" />
-    <File path="..\DerelictSDL2\source\derelict\sdl2\mixer.d" />
-    <File path="..\DerelictSDL2\source\derelict\sdl2\net.d" />
-    <File path="..\DerelictSDL2\source\derelict\sdl2\sdl.d" />
-    <File path="..\DerelictSDL2\source\derelict\sdl2\ttf.d" />
-    <File path="..\DerelictSDL2\source\derelict\sdl2\types.d" />
-   </Folder>
-   <Folder name="DerelictUtil">
-    <File path="..\DerelictUtil\source\derelict\util\exception.d" />
-    <File path="..\DerelictUtil\source\derelict\util\loader.d" />
-    <File path="..\DerelictUtil\source\derelict\util\sharedlib.d" />
-    <File path="..\DerelictUtil\source\derelict\util\system.d" />
-    <File path="..\DerelictUtil\source\derelict\util\wintypes.d" />
-    <File path="..\DerelictUtil\source\derelict\util\xtypes.d" />
-   </Folder>
-   <Folder name="de_image">
-    <File path="..\de_image\source\png\devisualization\image\png\chunks.d" />
-    <File path="..\de_image\source\interfaces\devisualization\image\color.d" />
-    <File path="..\de_image\source\interfaces\devisualization\image\creation.d" />
-    <File path="..\de_image\source\png\devisualization\image\png\defs.d" />
-    <File path="..\de_image\source\interfaces\devisualization\image\image.d" />
-    <File path="..\de_image\source\interfaces\devisualization\image\manipulation.d" />
-    <File path="..\de_image\source\interfaces\devisualization\image\package.d" />
-    <File path="..\de_image\source\png\devisualization\image\png\package.d" />
-    <File path="..\de_image\source\png\devisualization\image\png\reader.d" />
-    <File path="..\de_image\source\png\devisualization\image\png\reader_chunks.d" />
-    <File path="..\de_image\source\png\devisualization\image\png\reader_chunks_IDAT.d" />
-    <File path="..\de_image\source\png\devisualization\image\png\writer.d" />
-    <File path="..\de_image\source\png\devisualization\image\png\writer_chunks.d" />
-    <File path="..\de_image\source\png\devisualization\image\png\writer_chunks_IDAT.d" />
-   </Folder>
-   <Folder name="dlib_image">
-    <File path="..\dlib\dlib\container\aarray.d" />
-    <File path="..\dlib\dlib\container\array.d" />
-    <File path="..\dlib\dlib\image\io\bmp.d" />
-    <File path="..\dlib\dlib\container\bst.d" />
-    <File path="..\dlib\dlib\image\color.d" />
-    <File path="..\dlib\dlib\filesystem\windows\common.d" />
-    <File path="..\dlib\dlib\core\compound.d" />
-    <File path="..\dlib\dlib\math\decomposition.d" />
-    <File path="..\dlib\dlib\filesystem\delegaterange.d" />
-    <File path="..\dlib\dlib\filesystem\windows\directory.d" />
-    <File path="..\dlib\dlib\filesystem\dirrange.d" />
-    <File path="..\dlib\dlib\filesystem\windows\file.d" />
-    <File path="..\dlib\dlib\filesystem\filesystem.d" />
-    <File path="..\dlib\dlib\container\hash.d" />
-    <File path="..\dlib\dlib\coding\huffman.d" />
-    <File path="..\dlib\dlib\image\io\idct.d" />
-    <File path="..\dlib\dlib\image\image.d" />
-    <File path="..\dlib\dlib\math\interpolation.d" />
-    <File path="..\dlib\dlib\image\io\io.d" />
-    <File path="..\dlib\dlib\image\io\jpeg.d" />
-    <File path="..\dlib\dlib\container\linkedlist.d" />
-    <File path="..\dlib\dlib\math\linsolve.d" />
-    <File path="..\dlib\dlib\filesystem\local.d" />
-    <File path="..\dlib\dlib\math\matrix.d" />
-    <File path="..\dlib\dlib\core\memory.d" />
-    <File path="..\dlib\dlib\container\package.d" />
-    <File path="..\dlib\dlib\image\io\png.d" />
-    <File path="..\dlib\dlib\container\queue.d" />
-    <File path="..\dlib\dlib\functional\range.d" />
-    <File path="..\dlib\dlib\container\stack.d" />
-    <File path="..\dlib\dlib\core\stream.d" />
-    <File path="..\dlib\dlib\image\io\tga.d" />
-    <File path="..\dlib\dlib\core\tuple.d" />
-    <File path="..\dlib\dlib\math\utils.d" />
-    <File path="..\dlib\dlib\image\io\utils.d" />
-    <File path="..\dlib\dlib\math\vector.d" />
-    <File path="..\dlib\dlib\coding\zlib.d" />
-   </Folder>
-   <Folder name="fontconfig">
-    <File path="3rdparty\fontconfig\functions.d" />
-    <File path="3rdparty\fontconfig\package.d" />
-    <File path="3rdparty\fontconfig\types.d" />
-   </Folder>
-   <Folder name="gl3n">
-    <File path="..\gl3n\gl3n\aabb.d" />
-    <File path="..\gl3n\gl3n\frustum.d" />
-    <File path="..\gl3n\gl3n\interpolate.d" />
-    <File path="..\gl3n\gl3n\linalg.d" />
-    <File path="..\gl3n\gl3n\math.d" />
-    <File path="..\gl3n\gl3n\plane.d" />
-    <File path="..\gl3n\gl3n\util.d" />
-   </Folder>
-   <Folder name="win32">
-    <File path="3rdparty\win32\basetsd.d" />
-    <File path="3rdparty\win32\basetyps.d" />
-    <File path="3rdparty\win32\cderr.d" />
-    <File path="3rdparty\win32\cguid.d" />
-    <File path="3rdparty\win32\commdlg.d" />
-    <File path="3rdparty\win32\core.d" />
-    <File path="3rdparty\win32\dde.d" />
-    <File path="3rdparty\win32\ddeml.d" />
-    <File path="3rdparty\win32\dlgs.d" />
-    <File path="3rdparty\win32\imm.d" />
-    <File path="3rdparty\win32\lzexpand.d" />
-    <File path="3rdparty\win32\mmsystem.d" />
-    <File path="3rdparty\win32\nb30.d" />
-    <File path="3rdparty\win32\oaidl.d" />
-    <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" />
-    <File path="3rdparty\win32\olectlid.d" />
-    <File path="3rdparty\win32\oleidl.d" />
-    <File path="3rdparty\win32\prsht.d" />
-    <File path="3rdparty\win32\rpc.d" />
-    <File path="3rdparty\win32\rpcdce.d" />
-    <File path="3rdparty\win32\rpcdcep.d" />
-    <File path="3rdparty\win32\rpcndr.d" />
-    <File path="3rdparty\win32\rpcnsi.d" />
-    <File path="3rdparty\win32\rpcnsip.d" />
-    <File path="3rdparty\win32\rpcnterr.d" />
-    <File path="3rdparty\win32\shellapi.d" />
-    <File path="3rdparty\win32\shlobj.d" />
-    <File path="3rdparty\win32\unknwn.d" />
-    <File path="3rdparty\win32\uuid.d" />
-    <File path="3rdparty\win32\w32api.d" />
-    <File path="3rdparty\win32\winbase.d" />
-    <File path="3rdparty\win32\wincon.d" />
-    <File path="3rdparty\win32\windef.d" />
-    <File path="3rdparty\win32\windows.d" />
-    <File path="3rdparty\win32\winerror.d" />
-    <File path="3rdparty\win32\wingdi.d" />
-    <File path="3rdparty\win32\winnetwk.d" />
-    <File path="3rdparty\win32\winnls.d" />
-    <File path="3rdparty\win32\winnt.d" />
-    <File path="3rdparty\win32\winperf.d" />
-    <File path="3rdparty\win32\winsock2.d" />
-    <File path="3rdparty\win32\winspool.d" />
-    <File path="3rdparty\win32\winsvc.d" />
-    <File path="3rdparty\win32\winuser.d" />
-    <File path="3rdparty\win32\winver.d" />
-    <File path="3rdparty\win32\ws2tcpip.d" />
-    <File path="3rdparty\win32\wtypes.d" />
-   </Folder>
-  </Folder>
-  <Folder name="src">
-   <Folder name="dlangui">
-    <Folder name="core">
-     <File path="src\dlangui\core\collections.d" />
-     <File path="src\dlangui\core\editable.d" />
-     <File path="src\dlangui\core\events.d" />
-     <File path="src\dlangui\core\files.d" />
-     <File path="src\dlangui\core\i18n.d" />
-     <File path="src\dlangui\core\linestream.d" />
-     <File path="src\dlangui\core\logger.d" />
-     <File path="src\dlangui\core\settings.d" />
-     <File path="src\dlangui\core\signals.d" />
-     <File path="src\dlangui\core\stdaction.d" />
-     <File path="src\dlangui\core\streams.d" />
-     <File path="src\dlangui\core\textsource.d" />
-     <File path="src\dlangui\core\types.d" />
-    </Folder>
-    <Folder name="dialogs">
-     <File path="src\dlangui\dialogs\dialog.d" />
-     <File path="src\dlangui\dialogs\filedlg.d" />
-     <File path="src\dlangui\dialogs\msgbox.d" />
-     <File path="src\dlangui\dialogs\settingsdialog.d" />
-    </Folder>
-    <Folder name="dml">
-     <File path="src\dlangui\dml\annotations.d" />
-     <File path="src\dlangui\dml\dmlhighlight.d" />
-     <File path="src\dlangui\dml\parser.d" />
-    </Folder>
-    <Folder name="graphics">
-     <Folder name="scene">
-      <File path="src\dlangui\graphics\scene\camera.d" />
-      <File path="src\dlangui\graphics\scene\node.d" />
-      <File path="src\dlangui\graphics\scene\scene3d.d" />
-      <File path="src\dlangui\graphics\scene\transform.d" />
-     </Folder>
-     <Folder name="xpm">
-      <File path="src\dlangui\graphics\xpm\colors.d" />
-      <File path="src\dlangui\graphics\xpm\reader.d" />
-     </Folder>
-     <File path="src\dlangui\graphics\colors.d" />
-     <File path="src\dlangui\graphics\drawbuf.d" />
-     <File path="src\dlangui\graphics\fonts.d" />
-     <File path="src\dlangui\graphics\ftfonts.d" />
-     <File path="src\dlangui\graphics\gldrawbuf.d" />
-     <File path="src\dlangui\graphics\glsupport.d" />
-     <File path="src\dlangui\graphics\images.d" />
-     <File path="src\dlangui\graphics\resources.d" />
-    </Folder>
-    <Folder name="platforms">
-     <Folder name="common">
-      <File path="src\dlangui\platforms\common\platform.d" />
-     </Folder>
-     <Folder name="dsfml">
-      <File path="src\dlangui\platforms\dsfml\dsfmlapp.d" />
-     </Folder>
-     <Folder name="sdl">
-      <File path="src\dlangui\platforms\sdl\sdlapp.d" />
-     </Folder>
-     <Folder name="windows">
-      <File path="src\dlangui\platforms\windows\win32drawbuf.d" />
-      <File path="src\dlangui\platforms\windows\win32fonts.d" />
-      <File path="src\dlangui\platforms\windows\winapp.d" />
-     </Folder>
-    </Folder>
-    <Folder name="widgets">
-     <File path="src\dlangui\widgets\appframe.d" />
-     <File path="src\dlangui\widgets\combobox.d" />
-     <File path="src\dlangui\widgets\controls.d" />
-     <File path="src\dlangui\widgets\docks.d" />
-     <File path="src\dlangui\widgets\editors.d" />
-     <File path="src\dlangui\widgets\grid.d" />
-     <File path="src\dlangui\widgets\layouts.d" />
-     <File path="src\dlangui\widgets\lists.d" />
-     <File path="src\dlangui\widgets\menu.d" />
-     <File path="src\dlangui\widgets\metadata.d" />
-     <File path="src\dlangui\widgets\popup.d" />
-     <File path="src\dlangui\widgets\scroll.d" />
-     <File path="src\dlangui\widgets\srcedit.d" />
-     <File path="src\dlangui\widgets\statusline.d" />
-     <File path="src\dlangui\widgets\styles.d" />
-     <File path="src\dlangui\widgets\tabs.d" />
-     <File path="src\dlangui\widgets\toolbars.d" />
-     <File path="src\dlangui\widgets\tree.d" />
-     <File path="src\dlangui\widgets\widget.d" />
-     <File path="src\dlangui\widgets\winframe.d" />
-    </Folder>
-    <File path="src\dlangui\package.d" />
-   </Folder>
-  </Folder>
- </Folder>
-</DProject>
diff --git a/dlanguimonod-win32.sln b/dlanguimonod-win32.sln
deleted file mode 100644
index 615564d0..00000000
--- a/dlanguimonod-win32.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "dlanguilib-win32", "dlanguilib-win32.dproj", "{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}"
-EndProject
-Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "example1", "examples\example1\example1.dproj", "{11EEFA98-AAC1-45BD-8972-C97571D2D196}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-		Unittest|Any CPU = Unittest|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Release|Any CPU.Build.0 = Release|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Unittest|Any CPU.ActiveCfg = Unittest|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Unittest|Any CPU.Build.0 = Unittest|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = examples\example1\example1.dproj
-	EndGlobalSection
-EndGlobal
diff --git a/dlanguimonod.sln b/dlanguimonod.sln
deleted file mode 100644
index 6dcd0a98..00000000
--- a/dlanguimonod.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "dlanguilib", "dlanguilib.dproj", "{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}"
-EndProject
-Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "example1", "examples\example1\example1.dproj", "{440816C8-DBD6-454C-A0D7-B6E59CA1ED87}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-		Unittest|Any CPU = Unittest|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Release|Any CPU.Build.0 = Release|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Unittest|Any CPU.ActiveCfg = Unittest|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Unittest|Any CPU.Build.0 = Unittest|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = examples\example1\example1.dproj
-	EndGlobalSection
-EndGlobal
diff --git a/examples/d3d/d3d_msvc.visualdproj b/examples/d3d/d3d-msvc.visualdproj
similarity index 90%
rename from examples/d3d/d3d_msvc.visualdproj
rename to examples/d3d/d3d-msvc.visualdproj
index 7d9d91d4..b6a3df2c 100644
--- a/examples/d3d/d3d_msvc.visualdproj
+++ b/examples/d3d/d3d-msvc.visualdproj
@@ -53,7 +53,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -155,7 +155,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -257,7 +257,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -359,7 +359,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
diff --git a/examples/d3d/d3d.visualdproj b/examples/d3d/d3d.visualdproj
deleted file mode 100644
index e5920820..00000000
--- a/examples/d3d/d3d.visualdproj
+++ /dev/null
@@ -1,210 +0,0 @@
-<DProject>
- <ProjectGuid>{55B79469-E5D8-4B58-89BD-5A3E11A696B0}</ProjectGuid>
- <Config name="Debug" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>0</lib>
-  <subsystem>2</subsystem>
-  <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>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>0</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <nofloat>0</nofloat>
-  <Dversion>2.043</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>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids />
-  <versionlevel>0</versionlevel>
-  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources</versionids>
-  <dump_source>0</dump_source>
-  <mapverbosity>0</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>1</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles>ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib</libfiles>
-  <libpaths />
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).exe</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <cRuntime>2</cRuntime>
-  <privatePhobos>0</privatePhobos>
-  <additionalOptions />
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Config name="Release" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>0</lib>
-  <subsystem>2</subsystem>
-  <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>0</optimize>
-  <cpu>0</cpu>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>1</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <nofloat>0</nofloat>
-  <Dversion>2.043</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 />
-  <fileImppath />
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids />
-  <versionlevel>0</versionlevel>
-  <versionids />
-  <dump_source>0</dump_source>
-  <mapverbosity>0</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>0</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles>ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib</libfiles>
-  <libpaths />
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).exe</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <cRuntime>1</cRuntime>
-  <privatePhobos>0</privatePhobos>
-  <additionalOptions />
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Folder name="d3d">
-  <File path="src\d3d.d" />
- </Folder>
-</DProject>
diff --git a/examples/derelictcocoatest-monod-osx/derelictcocoatest-monod-osx.dproj b/examples/derelictcocoatest-monod-osx/derelictcocoatest-monod-osx.dproj
index 6c640c5e..67b8eda5 100644
--- a/examples/derelictcocoatest-monod-osx/derelictcocoatest-monod-osx.dproj
+++ b/examples/derelictcocoatest-monod-osx/derelictcocoatest-monod-osx.dproj
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
     <ProjectGuid>{1F050D82-5245-4B51-A554-473194EA0DE9}</ProjectGuid>
     <Compiler>DMD2</Compiler>
     <PreferOneStepBuild>true</PreferOneStepBuild>
@@ -26,17 +26,6 @@
       </Includes>
     </Includes>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug</OutputPath>
-    <ObjectsDirectory>obj/Debug</ObjectsDirectory>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
-    <UnittestMode>false</UnittestMode>
-    <OutputName>derelictcocoatest-monod-osx</OutputName>
-    <Target>Executable</Target>
-    <Externalconsole>true</Externalconsole>
-    <DebugLevel>0</DebugLevel>
-  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release</OutputPath>
     <ObjectsDirectory>obj/Release</ObjectsDirectory>
@@ -58,6 +47,25 @@
     <Externalconsole>true</Externalconsole>
     <DebugLevel>0</DebugLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug</OutputPath>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_SDL</String>
+        <String>USE_OPENGL</String>
+        <String>USE_FREETYPE</String>
+        <String>EmbedStandardResources</String>
+      </VersionIds>
+    </VersionIds>
+    <ObjectsDirectory>obj/Debug</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <UnittestMode>false</UnittestMode>
+    <OutputName>derelictcocoatest-monod-osx</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
   <ItemGroup>
     <Folder Include="src\" />
   </ItemGroup>
diff --git a/examples/derelictcocoatest-monod-osx/src/cocoatest.d b/examples/derelictcocoatest-monod-osx/src/cocoatest.d
index a88f6db9..56fe549b 100644
--- a/examples/derelictcocoatest-monod-osx/src/cocoatest.d
+++ b/examples/derelictcocoatest-monod-osx/src/cocoatest.d
@@ -1,43 +1,736 @@
 module cocoatest;
+version(OSX):
 
 import derelict.cocoa;
 
 import dlangui.core.logger;
+import dlangui.core.types;
+import dlangui.core.events;
+import std.uuid;
+import core.stdc.stdlib;
+import std.string;
 
 void main(string[] args)
 {
     Log.setStderrLogger();
     Log.setLogLevel(LogLevel.Trace);
     DerelictCocoa.load();
-    
-    NSString appName = NSProcessInfo.processInfo().processName();
-    Log.i("appName = %s", appName);
-    //writefln("appName = %s", appName);
-    
-    auto pool = new NSAutoreleasePool;
-    
-    auto NSApp = NSApplication.sharedApplication;
-    
-    NSApp.setActivationPolicy(NSApplicationActivationPolicyRegular);
-    
-    NSMenu menubar = NSMenu.alloc;
-    menubar.init_();
-    NSMenuItem appMenuItem = NSMenuItem.alloc();
-    appMenuItem.init_();
-    menubar.addItem(appMenuItem);
-    NSApp.setMainMenu(menubar);
-    
-    NSWindow window = NSWindow.alloc();
-    window.initWithContentRect(NSMakeRect(10, 10, 200, 200), 
-        NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask, //NSBorderlessWindowMask, 
-        NSBackingStoreBuffered, NO);
-    window.makeKeyAndOrderFront();
 
-    NSView parentView;
-    parentView = window.contentView();
-    
-    NSApp.activateIgnoringOtherApps(YES);
-    NSApp.run();
+    static if (true) {
+        auto pool = new NSAutoreleasePool;
+        NSString appName = NSProcessInfo.processInfo().processName();
+        Log.i("appName = %s", appName);
+
+        CocoaWindow window = new CocoaWindow(cast(void*)null, new IWindowListenerLogger(), 300, 300);
+        Log.d("");
+    } else {
+
+
+        NSString appName = NSProcessInfo.processInfo().processName();
+        Log.i("appName = %s", appName);
+        //writefln("appName = %s", appName);
+        
+        auto pool = new NSAutoreleasePool;
+        
+        auto NSApp = NSApplication.sharedApplication;
+        
+        NSApp.setActivationPolicy(NSApplicationActivationPolicyRegular);
+        
+        NSMenu menubar = NSMenu.alloc;
+        menubar.init_();
+        NSMenuItem appMenuItem = NSMenuItem.alloc();
+        appMenuItem.init_();
+        menubar.addItem(appMenuItem);
+        NSApp.setMainMenu(menubar);
+        
+        NSWindow window = NSWindow.alloc();
+        window.initWithContentRect(NSMakeRect(10, 10, 200, 200), 
+            NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask, //NSBorderlessWindowMask, 
+            NSBackingStoreBuffered, NO);
+        window.makeKeyAndOrderFront();
+
+        NSView parentView;
+        parentView = window.contentView();
+
+        Log.i("parentView=", parentView);
+        
+        NSApp.activateIgnoringOtherApps(YES);
+
+    //    string uuid = randomUUID().toString();
+    //    DlanguiCocoaView.customClassName = "DlanguiCocoaView_" ~ uuid;
+    //    DlanguiCocoaView.registerSubclass();
+    //    
+    //    _view = DlanguiCocoaView.alloc();
+    //    _view.initialize(this, width, height);
+    //    
+    //    parentView.addSubview(_view);
+
+
+        NSApp.run();
+    }
 
     DerelictCocoa.unload();
 }
+
+interface IWindowListener {
+    void onMouseWheel(int x, int y, int deltaX, int deltaY, MouseState state);
+    void onKeyDown(uint key);
+    void onKeyUp(uint key);
+    void onMouseMove(int x, int y, int deltaX, int deltaY,
+        MouseState mouseState);
+    void onMouseRelease(int x, int y, MouseButton mb, MouseState mouseState);
+    void onMouseClick(int x, int y, MouseButton mb, bool isDoubleClick, MouseState mouseState);
+    void recomputeDirtyAreas();
+    void onResized(int width, int height);
+    void onAnimate(double dt, double time);
+    Rect getDirtyRectangle();
+}
+
+class IWindowListenerLogger : IWindowListener {
+    override void onMouseWheel(int x, int y, int deltaX, int deltaY, MouseState state) {
+        Log.d("onMouseWheel");
+    }
+    override void onKeyDown(uint key) {
+        Log.d("onKeyDown");
+    }
+    override void onKeyUp(uint key) {
+        Log.d("onKeyUp");
+    }
+    override void onMouseMove(int x, int y, int deltaX, int deltaY,
+        MouseState mouseState) {
+        Log.d("onMouseMove");
+    }
+    override void onMouseRelease(int x, int y, MouseButton mb, MouseState mouseState) {
+        Log.d("onMouseRelease");
+    }
+    override void onMouseClick(int x, int y, MouseButton mb, bool isDoubleClick, MouseState mouseState) {
+        Log.d("onMouseClick");
+    }
+    override void recomputeDirtyAreas() {
+        Log.d("recomputeDirtyAreas");
+    }
+    override void onResized(int width, int height) {
+        Log.d("onResized");
+    }
+    override void onAnimate(double dt, double time) {
+        Log.d("onAnimate");
+    }
+    override Rect getDirtyRectangle() {
+        return Rect(0, 0, 100, 100);
+    }
+}
+
+struct MouseState {
+    bool leftButtonDown;
+    bool rightButtonDown;
+    bool middleButtonDown;
+    bool ctrlPressed;
+    bool shiftPressed;
+    bool altPressed;
+}
+
+enum MouseButton : int {
+    left,
+    right,
+    middle
+}
+
+final class CocoaWindow 
+{
+private:
+    IWindowListener _listener;
+    
+    // Stays null in the case of a plugin, but exists for a stand-alone program
+    // For testing purpose.
+    NSWindow _cocoaWindow = null;
+    NSApplication _cocoaApplication;
+    
+    NSColorSpace _nsColorSpace;
+    CGColorSpaceRef _cgColorSpaceRef;
+    NSData _imageData;
+    NSString _logFormatStr;
+    
+    DPlugCustomView _view = null;
+    
+    bool _terminated = false;
+    
+    int _lastMouseX, _lastMouseY;
+    bool _firstMouseMove = true;
+    
+    int _width;
+    int _height;
+    
+    ubyte* _buffer = null;
+    
+    uint _timeAtCreationInMs;
+    uint _lastMeasturedTimeInMs;
+    bool _dirtyAreasAreNotYetComputed;
+    
+public:
+    
+    this(void* parentWindow, IWindowListener listener, int width, int height)
+    {
+        _listener = listener;
+        
+        DerelictCocoa.load();
+        NSApplicationLoad(); // to use Cocoa in Carbon applications
+        bool parentViewExists = parentWindow !is null;
+        NSView parentView;
+        if (!parentViewExists)
+        {
+            // create a NSWindow to hold our NSView
+            _cocoaApplication = NSApplication.sharedApplication;
+            _cocoaApplication.setActivationPolicy(NSApplicationActivationPolicyRegular);
+            
+            NSWindow window = NSWindow.alloc();
+            window.initWithContentRect(NSMakeRect(100, 100, width, height),
+                NSBorderlessWindowMask, NSBackingStoreBuffered, NO);
+            window.makeKeyAndOrderFront();
+            
+            parentView = window.contentView();
+            
+            _cocoaApplication.activateIgnoringOtherApps(YES);
+        }
+        else
+            parentView = NSView(cast(id)parentWindow);
+        
+        
+        
+        _width = 0;
+        _height = 0;
+        
+        _nsColorSpace = NSColorSpace.sRGBColorSpace();
+        // hopefully not null else the colors will be brighter
+        _cgColorSpaceRef = _nsColorSpace.CGColorSpace();
+        
+        _logFormatStr = NSString.stringWith("%@");
+        
+        _timeAtCreationInMs = getTimeMs();
+        _lastMeasturedTimeInMs = _timeAtCreationInMs;
+        
+        _dirtyAreasAreNotYetComputed = true;
+        
+        string uuid = randomUUID().toString();
+        DPlugCustomView.customClassName = "DPlugCustomView_" ~ uuid;
+        DPlugCustomView.registerSubclass();
+        
+        _view = DPlugCustomView.alloc();
+        _view.initialize(this, width, height);
+        
+        parentView.addSubview(_view);
+        
+        if (_cocoaApplication)
+            _cocoaApplication.run();
+        
+        
+    }
+    
+    ~this()
+    {
+        if (_view)
+        {
+            //debug ensureNotInGC("CocoaWindow");
+            _terminated = true;
+            
+            {
+                _view.killTimer();
+            }
+            
+            _view.removeFromSuperview();
+            _view.release();
+            _view = DPlugCustomView(null);
+            
+            DPlugCustomView.unregisterSubclass();
+            
+            if (_buffer != null)
+            {
+                free(_buffer);
+                _buffer = null;
+            }
+            
+            DerelictCocoa.unload();
+        }
+    }
+    
+    // Implements IWindow
+    void waitEventAndDispatch()
+    {
+        assert(false); // not implemented in Cocoa, since we don't have a NSWindow
+    }
+    
+    bool terminated()
+    {
+        return _terminated;
+    }
+    
+    void debugOutput(string s)
+    {
+        import core.stdc.stdio;
+        fprintf(stderr, toStringz(s));
+    }
+    
+    uint getTimeMs()
+    {
+        return cast(uint)(NSDate.timeIntervalSinceReferenceDate() * 1000.0);
+    }
+    
+private:
+    
+    MouseState getMouseState(NSEvent event)
+    {
+        // not working
+        MouseState state;
+        uint pressedMouseButtons = event.pressedMouseButtons();
+        if (pressedMouseButtons & 1)
+            state.leftButtonDown = true;
+        if (pressedMouseButtons & 2)
+            state.rightButtonDown = true;
+        if (pressedMouseButtons & 4)
+            state.middleButtonDown = true;
+        
+        NSEventModifierFlags mod = event.modifierFlags();
+        if (mod & NSControlKeyMask)
+            state.ctrlPressed = true;
+        if (mod & NSShiftKeyMask)
+            state.shiftPressed = true;
+        if (mod & NSAlternateKeyMask)
+            state.altPressed = true;
+        
+        return state;
+    }
+    
+    void handleMouseWheel(NSEvent event)
+    {
+        int deltaX = cast(int)(0.5 + 10 * event.deltaX);
+        int deltaY = cast(int)(0.5 + 10 * event.deltaY);
+        Point mousePos = getMouseXY(_view, event, _height);
+        _listener.onMouseWheel(mousePos.x, mousePos.y, deltaX, deltaY, getMouseState(event));
+    }
+    
+    void handleKeyEvent(NSEvent event, bool released)
+    {
+        uint keyCode = event.keyCode();
+        uint key;
+        switch (keyCode)
+        {
+            case kVK_ANSI_Keypad0: key = KeyCode.KEY_0; break;
+            case kVK_ANSI_Keypad1: key = KeyCode.KEY_1; break;
+            case kVK_ANSI_Keypad2: key = KeyCode.KEY_2; break;
+            case kVK_ANSI_Keypad3: key = KeyCode.KEY_3; break;
+            case kVK_ANSI_Keypad4: key = KeyCode.KEY_4; break;
+            case kVK_ANSI_Keypad5: key = KeyCode.KEY_5; break;
+            case kVK_ANSI_Keypad6: key = KeyCode.KEY_6; break;
+            case kVK_ANSI_Keypad7: key = KeyCode.KEY_7; break;
+            case kVK_ANSI_Keypad8: key = KeyCode.KEY_8; break;
+            case kVK_ANSI_Keypad9: key = KeyCode.KEY_9; break;
+            case kVK_Return: key = KeyCode.RETURN; break;
+            case kVK_Escape: key = KeyCode.ESCAPE; break;
+            case kVK_LeftArrow: key = KeyCode.LEFT; break;
+            case kVK_RightArrow: key = KeyCode.RIGHT; break;
+            case kVK_DownArrow: key = KeyCode.DOWN; break;
+            case kVK_UpArrow: key = KeyCode.UP; break;
+            default: key = 0;
+        }
+        
+        if (released)
+            _listener.onKeyDown(key);
+        else
+            _listener.onKeyUp(key);
+    }
+    
+    void handleMouseMove(NSEvent event)
+    {
+        Point mousePos = getMouseXY(_view, event, _height);
+        
+        if (_firstMouseMove)
+        {
+            _firstMouseMove = false;
+            _lastMouseX = mousePos.x;
+            _lastMouseY = mousePos.y;
+        }
+        
+        _listener.onMouseMove(mousePos.x, mousePos.y, mousePos.x - _lastMouseX, mousePos.y - _lastMouseY,
+            getMouseState(event));
+
+        _lastMouseX = mousePos.x;
+        _lastMouseY = mousePos.y;
+    }
+    
+    void handleMouseClicks(NSEvent event, MouseButton mb, bool released)
+    {
+        Point mousePos = getMouseXY(_view, event, _height);
+        
+        if (released)
+            _listener.onMouseRelease(mousePos.x, mousePos.y, mb, getMouseState(event));
+        else
+        {
+            int clickCount = event.clickCount();
+            bool isDoubleClick = clickCount >= 2;
+            _listener.onMouseClick(mousePos.x, mousePos.y, mb, isDoubleClick, getMouseState(event));
+        }
+    }
+    
+    enum scanLineAlignment = 4; // could be anything
+    
+    // given a width, how long in bytes should scanlines be
+    int byteStride(int width)
+    {
+        int widthInBytes = width * 4;
+        return (widthInBytes + (scanLineAlignment - 1)) & ~(scanLineAlignment-1);
+    }
+    
+    void drawRect(NSRect rect)
+    {
+        NSGraphicsContext nsContext = NSGraphicsContext.currentContext();
+        
+        CIContext ciContext = nsContext.getCIContext();
+        
+        // update internal buffers in case of startup/resize
+        {
+            NSRect boundsRect = _view.bounds();
+            int width = cast(int)(boundsRect.size.width);   // truncating down the dimensions of bounds
+            int height = cast(int)(boundsRect.size.height);
+            updateSizeIfNeeded(width, height);
+        }
+        
+        // The first drawRect callback occurs before the timer triggers.
+        // But because recomputeDirtyAreas() wasn't called before there is nothing to draw.
+        // Hence, do it.
+        if (_dirtyAreasAreNotYetComputed)
+        {
+            _dirtyAreasAreNotYetComputed = false;
+            _listener.recomputeDirtyAreas();
+        }
+        
+        // draw buffers
+//        ImageRef!RGBA wfb;
+//        wfb.w = _width;
+//        wfb.h = _height;
+//        wfb.pitch = byteStride(_width);
+//        wfb.pixels = cast(RGBA*)_buffer;
+//        _listener.onDraw(wfb, WindowPixelFormat.ARGB8);
+        
+        
+        size_t sizeNeeded = byteStride(_width) * _height;
+        _imageData = NSData.dataWithBytesNoCopy(_buffer, sizeNeeded, false);
+        
+        CIImage image = CIImage.imageWithBitmapData(_imageData,
+            byteStride(_width),
+            CGSize(_width, _height),
+            kCIFormatARGB8,
+            _cgColorSpaceRef);
+        
+        ciContext.drawImage(image, rect, rect);
+    }
+    
+    /// Returns: true if window size changed.
+    bool updateSizeIfNeeded(int newWidth, int newHeight)
+    {
+        // only do something if the client size has changed
+        if ( (newWidth != _width) || (newHeight != _height) )
+        {
+            // Extends buffer
+            if (_buffer != null)
+            {
+                free(_buffer);
+                _buffer = null;
+            }
+            
+            size_t sizeNeeded = byteStride(newWidth) * newHeight;
+            _buffer = cast(ubyte*) malloc(sizeNeeded);
+            _width = newWidth;
+            _height = newHeight;
+            _listener.onResized(_width, _height);
+            return true;
+        }
+        else
+            return false;
+    }
+    
+    void doAnimation()
+    {
+        uint now = getTimeMs();
+        double dt = (now - _lastMeasturedTimeInMs) * 0.001;
+        double time = (now - _timeAtCreationInMs) * 0.001; // hopefully no plug-in will be open more than 49 days
+        _lastMeasturedTimeInMs = now;
+        _listener.onAnimate(dt, time);
+    }
+    
+    void onTimer()
+    {
+        // Deal with animation
+        doAnimation();
+        
+        _listener.recomputeDirtyAreas();
+        _dirtyAreasAreNotYetComputed = false;
+        Rect dirtyRect = _listener.getDirtyRectangle();
+        if (!dirtyRect.empty())
+        {
+            
+            NSRect boundsRect = _view.bounds();
+            int height = cast(int)(boundsRect.size.height);
+            NSRect r = NSMakeRect(dirtyRect.left,
+                height - dirtyRect.top - dirtyRect.height,
+                dirtyRect.width,
+                dirtyRect.height);
+            _view.setNeedsDisplayInRect(r);
+        }
+    }
+}
+
+struct DPlugCustomView
+{
+    // This class uses a unique class name for each plugin instance
+    static string customClassName = null;
+    
+    NSView parent;
+    alias parent this;
+    
+    // create from an id
+    this (id id_)
+    {
+        this._id = id_;
+    }
+    
+    /// Allocates, but do not init
+    static DPlugCustomView alloc()
+    {
+        alias fun_t = extern(C) id function (id obj, SEL sel);
+        return DPlugCustomView( (cast(fun_t)objc_msgSend)(getClassID(), sel!"alloc") );
+    }
+    
+    static Class getClass()
+    {
+        return cast(Class)( getClassID() );
+    }
+    
+    static id getClassID()
+    {
+        assert(customClassName !is null);
+        return objc_getClass(customClassName);
+    }
+    
+private:
+    
+    CocoaWindow _window;
+    NSTimer _timer = null;
+    
+    void initialize(CocoaWindow window, int width, int height)
+    {
+        // Warning: taking this address is fishy since DPlugCustomView is a struct and thus could be copied
+        // we rely on the fact it won't :|
+        void* thisPointer = cast(void*)(&this);
+        object_setInstanceVariable(_id, "this", thisPointer);
+        
+        this._window = window;
+        
+        NSRect r = NSRect(NSPoint(0, 0), NSSize(width, height));
+        initWithFrame(r);
+        
+        _timer = NSTimer.timerWithTimeInterval(1 / 60.0, this, sel!"onTimer:", null, true);
+        NSRunLoop.currentRunLoop().addTimer(_timer, NSRunLoopCommonModes);
+    }
+    
+    static Class clazz;
+    
+    static void registerSubclass()
+    {
+        clazz = objc_allocateClassPair(cast(Class) lazyClass!"NSView", toStringz(customClassName), 0);
+        
+        class_addMethod(clazz, sel!"keyDown:", cast(IMP) &keyDown, "v@:@");
+        class_addMethod(clazz, sel!"keyUp:", cast(IMP) &keyUp, "v@:@");
+        class_addMethod(clazz, sel!"mouseDown:", cast(IMP) &mouseDown, "v@:@");
+        class_addMethod(clazz, sel!"mouseUp:", cast(IMP) &mouseUp, "v@:@");
+        class_addMethod(clazz, sel!"rightMouseDown:", cast(IMP) &rightMouseDown, "v@:@");
+        class_addMethod(clazz, sel!"rightMouseUp:", cast(IMP) &rightMouseUp, "v@:@");
+        class_addMethod(clazz, sel!"otherMouseDown:", cast(IMP) &otherMouseDown, "v@:@");
+        class_addMethod(clazz, sel!"otherMouseUp:", cast(IMP) &otherMouseUp, "v@:@");
+        class_addMethod(clazz, sel!"mouseMoved:", cast(IMP) &mouseMoved, "v@:@");
+        class_addMethod(clazz, sel!"mouseDragged:", cast(IMP) &mouseMoved, "v@:@");
+        class_addMethod(clazz, sel!"rightMouseDragged:", cast(IMP) &mouseMoved, "v@:@");
+        class_addMethod(clazz, sel!"otherMouseDragged:", cast(IMP) &mouseMoved, "v@:@");
+        class_addMethod(clazz, sel!"acceptsFirstResponder", cast(IMP) &acceptsFirstResponder, "b@:");
+        class_addMethod(clazz, sel!"isOpaque", cast(IMP) &isOpaque, "b@:");
+        class_addMethod(clazz, sel!"acceptsFirstMouse:", cast(IMP) &acceptsFirstMouse, "b@:@");
+        class_addMethod(clazz, sel!"viewDidMoveToWindow", cast(IMP) &viewDidMoveToWindow, "v@:");
+        class_addMethod(clazz, sel!"drawRect:", cast(IMP) &drawRect, "v@:" ~ encode!NSRect);
+        class_addMethod(clazz, sel!"onTimer:", cast(IMP) &onTimer, "v@:@");
+        
+        // This ~ is to avoid a strange DMD ICE. Didn't succeed in isolating it.
+        class_addMethod(clazz, sel!("scroll" ~ "Wheel:") , cast(IMP) &scrollWheel, "v@:@");
+        
+        // very important: add an instance variable for the this pointer so that the D object can be
+        // retrieved from an id
+        class_addIvar(clazz, "this", (void*).sizeof, (void*).sizeof == 4 ? 2 : 3, "^v");
+        
+        objc_registerClassPair(clazz);
+    }
+    
+    static void unregisterSubclass()
+    {
+        // For some reason the class need to continue to exist, so we leak it
+        //  objc_disposeClassPair(clazz);
+        // TODO: remove this crap
+    }
+    
+    void killTimer()
+    {
+        if (_timer)
+        {
+            _timer.invalidate();
+            _timer = NSTimer(null);
+        }
+    }
+}
+
+DPlugCustomView getInstance(id anId)
+{
+    // strange thing: object_getInstanceVariable definition is odd (void**)
+    // and only works for pointer-sized values says SO
+    void* thisPointer = null;
+    Ivar var = object_getInstanceVariable(anId, "this", &thisPointer);
+    assert(var !is null);
+    assert(thisPointer !is null);
+    return *cast(DPlugCustomView*)thisPointer;
+}
+
+Point getMouseXY(NSView view, NSEvent event, int windowHeight)
+{
+    NSPoint mouseLocation = event.locationInWindow();
+    mouseLocation = view.convertPoint(mouseLocation, NSView(null));
+    int px = cast(int)(mouseLocation.x) - 2;
+    int py = windowHeight - cast(int)(mouseLocation.y) - 3;
+    return Point(px, py);
+}
+
+// Overridden function gets called with an id, instead of the self pointer.
+// So we have to get back the D class object address.
+// Big thanks to Mike Ash (@macdev)
+extern(C)
+{
+    void keyDown(id self, SEL selector, id event)
+    {
+        //FPControl fpctrl;
+        //fpctrl.initialize();
+        DPlugCustomView view = getInstance(self);
+        view._window.handleKeyEvent(NSEvent(event), false);
+    }
+    
+    void keyUp(id self, SEL selector, id event)
+    {
+        //FPControl fpctrl;
+        //fpctrl.initialize();
+        DPlugCustomView view = getInstance(self);
+        view._window.handleKeyEvent(NSEvent(event), true);
+    }
+    
+    void mouseDown(id self, SEL selector, id event)
+    {
+        //FPControl fpctrl;
+        //fpctrl.initialize();
+        DPlugCustomView view = getInstance(self);
+        view._window.handleMouseClicks(NSEvent(event), MouseButton.left, false);
+    }
+    
+    void mouseUp(id self, SEL selector, id event)
+    {
+        //FPControl fpctrl;
+        //fpctrl.initialize();
+        DPlugCustomView view = getInstance(self);
+        view._window.handleMouseClicks(NSEvent(event), MouseButton.left, true);
+    }
+    
+    void rightMouseDown(id self, SEL selector, id event)
+    {
+        //FPControl fpctrl;
+        //fpctrl.initialize();
+        DPlugCustomView view = getInstance(self);
+        view._window.handleMouseClicks(NSEvent(event), MouseButton.right, false);
+    }
+    
+    void rightMouseUp(id self, SEL selector, id event)
+    {
+        //FPControl fpctrl;
+        //fpctrl.initialize();
+        DPlugCustomView view = getInstance(self);
+        view._window.handleMouseClicks(NSEvent(event), MouseButton.right, true);
+    }
+    
+    void otherMouseDown(id self, SEL selector, id event)
+    {
+        //FPControl fpctrl;
+        //fpctrl.initialize();
+        DPlugCustomView view = getInstance(self);
+        auto nsEvent = NSEvent(event);
+        if (nsEvent.buttonNumber == 2)
+            view._window.handleMouseClicks(nsEvent, MouseButton.middle, false);
+    }
+    
+    void otherMouseUp(id self, SEL selector, id event)
+    {
+        //FPControl fpctrl;
+        //fpctrl.initialize();
+        DPlugCustomView view = getInstance(self);
+        auto nsEvent = NSEvent(event);
+        if (nsEvent.buttonNumber == 2)
+            view._window.handleMouseClicks(nsEvent, MouseButton.middle, true);
+    }
+    
+    void mouseMoved(id self, SEL selector, id event)
+    {
+        //FPControl fpctrl;
+        //fpctrl.initialize();
+        DPlugCustomView view = getInstance(self);
+        view._window.handleMouseMove(NSEvent(event));
+    }
+    
+    void scrollWheel(id self, SEL selector, id event)
+    {
+        //FPControl fpctrl;
+        //fpctrl.initialize();
+        DPlugCustomView view = getInstance(self);
+        view._window.handleMouseWheel(NSEvent(event));
+    }
+    
+    bool acceptsFirstResponder(id self, SEL selector)
+    {
+        return YES;
+    }
+    
+    bool acceptsFirstMouse(id self, SEL selector, id pEvent)
+    {
+        return YES;
+    }
+    
+    bool isOpaque(id self, SEL selector)
+    {
+        return YES;
+    }
+    
+    void viewDidMoveToWindow(id self, SEL selector)
+    {
+        DPlugCustomView view = getInstance(self);
+        NSWindow parentWindow = view.window();
+        if (parentWindow)
+        {
+            parentWindow.makeFirstResponder(view);
+            parentWindow.setAcceptsMouseMovedEvents(true);
+        }
+    }
+    
+    void drawRect(id self, SEL selector, NSRect rect)
+    {
+        //FPControl fpctrl;
+        //fpctrl.initialize();
+        DPlugCustomView view = getInstance(self);
+        view._window.drawRect(rect);
+    }
+    
+    void onTimer(id self, SEL selector, id timer)
+    {
+        //FPControl fpctrl;
+        //fpctrl.initialize();
+        DPlugCustomView view = getInstance(self);
+        view._window.onTimer();
+    }
+}
\ No newline at end of file
diff --git a/examples/example1/example1.dproj b/examples/dmledit/dmledit-monod-osx.dproj
similarity index 53%
rename from examples/example1/example1.dproj
rename to examples/dmledit/dmledit-monod-osx.dproj
index 3caf296e..495f7ddb 100644
--- a/examples/example1/example1.dproj
+++ b/examples/dmledit/dmledit-monod-osx.dproj
@@ -2,83 +2,89 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{11EEFA98-AAC1-45BD-8972-C97571D2D196}</ProjectGuid>
-    <UseDefaultCompiler>true</UseDefaultCompiler>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <ProjectGuid>{8E3B1C65-63A3-4BD8-9268-604EE648E861}</ProjectGuid>
+    <Compiler>DMD2</Compiler>
     <PreferOneStepBuild>true</PreferOneStepBuild>
-    <Compiler>ldc2</Compiler>
+    <UseDefaultCompiler>true</UseDefaultCompiler>
     <IncrementalLinking>true</IncrementalLinking>
     <DependentProjectIds>
       <DependentProjectIds>
-        <String>{84FCA922-7BD9-4B9E-A192-A52F0A830AF5}</String>
-        <String>{2B088613-C536-4E5C-8B74-7913267D75DA}</String>
-        <String>{5355CB25-5AA9-4738-9A0F-C0673DBBCB07}</String>
-        <String>{0B737AB4-0C3B-4250-A133-3AD793E2D322}</String>
-        <String>{87EE4E19-2409-4441-A0C0-2E6D08C555D9}</String>
-        <String>{174F5AAC-3D16-4AD9-9041-0DC0723A78FE}</String>
+        <String>{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}</String>
       </DependentProjectIds>
     </DependentProjectIds>
     <Includes>
       <Includes>
         <Path>../../src</Path>
-        <Path>../../../DerelictUtil/source</Path>
-        <Path>../../../DerelictFI/source</Path>
-        <Path>../../../DerelictFT/source</Path>
-        <Path>../../../DerelictSDL2/source</Path>
-        <Path>../../../DerelictGL3/source</Path>
-        <Path>../../3rdparty</Path>
-        <Path>../../../dlib</Path>
+        <Path>../../deps/dlib</Path>
+        <Path>../../deps/gl3n</Path>
+        <Path>../../deps/DerelictGL3/source</Path>
+        <Path>../../deps/DerelictSDL2/source</Path>
+        <Path>../../deps/DerelictFT/source</Path>
+        <Path>../../deps/DerelictUtil/source</Path>
       </Includes>
     </Includes>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug</OutputPath>
-    <ObjectsDirectory>obj/Debug</ObjectsDirectory>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
-    <UnittestMode>false</UnittestMode>
-    <OutputName>example1</OutputName>
-    <Target>Executable</Target>
-    <Externalconsole>true</Externalconsole>
-    <DebugLevel>0</DebugLevel>
     <VersionIds>
       <VersionIds>
         <String>USE_SDL</String>
         <String>USE_OPENGL</String>
+        <String>USE_FREETYPE</String>
         <String>EmbedStandardResources</String>
       </VersionIds>
     </VersionIds>
-    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi
-</ExtraCompilerArguments>
-    <ExtraLinkerArguments>-ldl</ExtraLinkerArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release</OutputPath>
-    <ObjectsDirectory>obj/Release</ObjectsDirectory>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj/Debug</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
     <UnittestMode>false</UnittestMode>
-    <OutputName>example1</OutputName>
+    <OutputName>dmledit-monod-osx</OutputName>
     <Target>Executable</Target>
     <Externalconsole>true</Externalconsole>
     <DebugLevel>0</DebugLevel>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\Release</OutputPath>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_SDL</String>
+        <String>USE_OPENGL</String>
+        <String>USE_FREETYPE</String>
+        <String>EmbedStandardResources</String>
+      </VersionIds>
+    </VersionIds>
+    <ObjectsDirectory>obj/Release</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <UnittestMode>false</UnittestMode>
+    <OutputName>dmledit-monod-osx</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|x64' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Unittest</OutputPath>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_SDL</String>
+        <String>USE_OPENGL</String>
+        <String>USE_FREETYPE</String>
+        <String>EmbedStandardResources</String>
+      </VersionIds>
+    </VersionIds>
     <ObjectsDirectory>obj/Unittest</ObjectsDirectory>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
     <UnittestMode>true</UnittestMode>
-    <OutputName>example1</OutputName>
+    <OutputName>dmledit-monod-osx</OutputName>
     <Target>Executable</Target>
     <Externalconsole>true</Externalconsole>
     <DebugLevel>0</DebugLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Folder Include="src\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="src\example1.d" />
+    <Compile Include="src\dmledit.d" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/dmledit/dmledit-monod-windows.dproj b/examples/dmledit/dmledit-monod-windows.dproj
new file mode 100644
index 00000000..e1f9af57
--- /dev/null
+++ b/examples/dmledit/dmledit-monod-windows.dproj
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <ProjectGuid>{620F56F7-F6DE-45D2-955D-912A22EE728A}</ProjectGuid>
+    <Compiler>DMD2</Compiler>
+    <PreferOneStepBuild>true</PreferOneStepBuild>
+    <UseDefaultCompiler>true</UseDefaultCompiler>
+    <IncrementalLinking>true</IncrementalLinking>
+    <Includes>
+      <Includes>
+        <Path>..\..\src</Path>
+        <Path>..\..\deps\DerelictFT\source</Path>
+        <Path>..\..\deps\DerelictSDL2\source</Path>
+        <Path>..\..\deps\DerelictGL3\source</Path>
+        <Path>..\..\deps\DerelictUtil\source</Path>
+        <Path>..\..\deps\gl3n</Path>
+        <Path>..\..\deps\dlib</Path>
+      </Includes>
+    </Includes>
+    <DependentProjectIds>
+      <DependentProjectIds>
+        <String>{45FB40CD-E99A-4C12-AC52-C13364412E09}</String>
+      </DependentProjectIds>
+    </DependentProjectIds>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug</OutputPath>
+    <Target>Executable</Target>
+    <OutputName>dmledit-monod-windows</OutputName>
+    <UnittestMode>false</UnittestMode>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Debug</ObjectsDirectory>
+    <DebugLevel>0</DebugLevel>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+        <String>windows</String>
+      </VersionIds>
+    </VersionIds>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\Release</OutputPath>
+    <Target>Executable</Target>
+    <OutputName>dmledit-monod-windows</OutputName>
+    <UnittestMode>false</UnittestMode>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Release</ObjectsDirectory>
+    <DebugLevel>0</DebugLevel>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+        <String>windows</String>
+      </VersionIds>
+    </VersionIds>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Unittest</OutputPath>
+    <Externalconsole>true</Externalconsole>
+    <Target>Executable</Target>
+    <OutputName>dmledit-monod-windows</OutputName>
+    <UnittestMode>true</UnittestMode>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Unittest</ObjectsDirectory>
+    <DebugLevel>0</DebugLevel>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+        <String>windows</String>
+      </VersionIds>
+    </VersionIds>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="src\dmledit.d" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="src\win_app.def" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/dmledit/dmledit_msvc.visualdproj b/examples/dmledit/dmledit-msvc.visualdproj
similarity index 90%
rename from examples/dmledit/dmledit_msvc.visualdproj
rename to examples/dmledit/dmledit-msvc.visualdproj
index 084f8aa3..739a44ee 100644
--- a/examples/dmledit/dmledit_msvc.visualdproj
+++ b/examples/dmledit/dmledit-msvc.visualdproj
@@ -53,7 +53,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -72,7 +72,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources</versionids>
+  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources ForceLogs</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
@@ -155,7 +155,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -174,7 +174,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources</versionids>
+  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources ForceLogs</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
@@ -257,7 +257,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -276,7 +276,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources</versionids>
+  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources ForceLogs</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
@@ -359,7 +359,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -378,7 +378,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources</versionids>
+  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources ForceLogs</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
diff --git a/examples/dmledit/dmledit.visualdproj b/examples/dmledit/dmledit.visualdproj
deleted file mode 100644
index 9a550c44..00000000
--- a/examples/dmledit/dmledit.visualdproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<DProject>
- <ProjectGuid>{06D73450-2919-48A8-B2C3-738B12505D74}</ProjectGuid>
- <Config name="Debug" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>0</lib>
-  <subsystem>2</subsystem>
-  <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>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>0</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <nofloat>0</nofloat>
-  <Dversion>2.043</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>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath>views views/res views/res/i18n views/res/mdpi</fileImppath>
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids />
-  <versionlevel>0</versionlevel>
-  <versionids>EmbedStandardResources Unicode USE_FREETYPE</versionids>
-  <dump_source>0</dump_source>
-  <mapverbosity>0</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>1</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles>ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib</libfiles>
-  <libpaths />
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).exe</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <cRuntime>2</cRuntime>
-  <privatePhobos>0</privatePhobos>
-  <additionalOptions />
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Config name="Release" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>0</lib>
-  <subsystem>2</subsystem>
-  <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>0</optimize>
-  <cpu>0</cpu>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>1</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <nofloat>0</nofloat>
-  <Dversion>2.043</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>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath>views views/res views/res/i18n views/res/mdpi</fileImppath>
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids />
-  <versionlevel>0</versionlevel>
-  <versionids>EmbedStandardResources Unicode USE_FREETYPE</versionids>
-  <dump_source>0</dump_source>
-  <mapverbosity>0</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>0</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles>ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib</libfiles>
-  <libpaths />
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).exe</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <cRuntime>1</cRuntime>
-  <privatePhobos>0</privatePhobos>
-  <additionalOptions />
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Folder name="dmledit">
-  <Folder name="src">
-   <File path="src\dmledit.d" />
-  </Folder>
- </Folder>
-</DProject>
diff --git a/examples/example1/example1-monod-osx.dproj b/examples/example1/example1-monod-osx.dproj
index e61d4c7c..f65fc79b 100644
--- a/examples/example1/example1-monod-osx.dproj
+++ b/examples/example1/example1-monod-osx.dproj
@@ -25,27 +25,6 @@
       </Includes>
     </Includes>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release</OutputPath>
-    <ObjectsDirectory>obj/Release</ObjectsDirectory>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
-    <UnittestMode>false</UnittestMode>
-    <OutputName>example1-monod-osx</OutputName>
-    <Target>Executable</Target>
-    <Externalconsole>true</Externalconsole>
-    <DebugLevel>0</DebugLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Unittest</OutputPath>
-    <ObjectsDirectory>obj/Unittest</ObjectsDirectory>
-    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
-    <UnittestMode>true</UnittestMode>
-    <OutputName>example1-monod-osx</OutputName>
-    <Target>Executable</Target>
-    <Externalconsole>true</Externalconsole>
-    <DebugLevel>0</DebugLevel>
-  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug</OutputPath>
@@ -65,6 +44,47 @@
     <Target>Executable</Target>
     <Externalconsole>true</Externalconsole>
     <DebugLevel>0</DebugLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\Release</OutputPath>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_SDL</String>
+        <String>USE_OPENGL</String>
+        <String>USE_FREETYPE</String>
+        <String>EmbedStandardResources</String>
+      </VersionIds>
+    </VersionIds>
+    <ObjectsDirectory>obj/Release</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <UnittestMode>false</UnittestMode>
+    <OutputName>example1-monod-osx</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+    <ExtraLinkerArguments>-v</ExtraLinkerArguments>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Unittest</OutputPath>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_SDL</String>
+        <String>USE_OPENGL</String>
+        <String>USE_FREETYPE</String>
+        <String>EmbedStandardResources</String>
+      </VersionIds>
+    </VersionIds>
+    <ObjectsDirectory>obj/Unittest</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <UnittestMode>true</UnittestMode>
+    <OutputName>example1-monod-osx</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
     <ExtraLinkerArguments>-v</ExtraLinkerArguments>
   </PropertyGroup>
   <ItemGroup>
diff --git a/examples/example1/example1-monod-windows.dproj b/examples/example1/example1-monod-windows.dproj
new file mode 100644
index 00000000..ec7d301c
--- /dev/null
+++ b/examples/example1/example1-monod-windows.dproj
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <ProjectGuid>{32EF3B89-10C6-451E-90B9-868693B30D0F}</ProjectGuid>
+    <Compiler>DMD2</Compiler>
+    <PreferOneStepBuild>true</PreferOneStepBuild>
+    <UseDefaultCompiler>true</UseDefaultCompiler>
+    <IncrementalLinking>true</IncrementalLinking>
+    <DependentProjectIds>
+      <DependentProjectIds>
+        <String>{45FB40CD-E99A-4C12-AC52-C13364412E09}</String>
+      </DependentProjectIds>
+    </DependentProjectIds>
+    <Includes>
+      <Includes>
+        <Path>..\..\src</Path>
+        <Path>..\..\deps\DerelictFT\source</Path>
+        <Path>..\..\deps\DerelictSDL2\source</Path>
+        <Path>..\..\deps\DerelictGL3\source</Path>
+        <Path>..\..\deps\DerelictUtil\source</Path>
+        <Path>..\..\deps\gl3n</Path>
+        <Path>..\..\deps\dlib</Path>
+      </Includes>
+    </Includes>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug</OutputPath>
+    <Target>Executable</Target>
+    <OutputName>example1-monod-windows</OutputName>
+    <UnittestMode>false</UnittestMode>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Debug</ObjectsDirectory>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+        <String>windows</String>
+      </VersionIds>
+    </VersionIds>
+    <DebugLevel>0</DebugLevel>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\Release</OutputPath>
+    <Target>Executable</Target>
+    <OutputName>example1-monod-windows</OutputName>
+    <UnittestMode>false</UnittestMode>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Release</ObjectsDirectory>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+        <String>windows</String>
+      </VersionIds>
+    </VersionIds>
+    <DebugLevel>0</DebugLevel>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Unittest</OutputPath>
+    <Externalconsole>true</Externalconsole>
+    <Target>Executable</Target>
+    <OutputName>example1-monod-windows</OutputName>
+    <UnittestMode>true</UnittestMode>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Unittest</ObjectsDirectory>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+        <String>windows</String>
+      </VersionIds>
+    </VersionIds>
+    <DebugLevel>0</DebugLevel>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="src\example1.d" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="src\win_app.def" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/example1/example1_msvc.visualdproj b/examples/example1/example1-msvc.visualdproj
similarity index 87%
rename from examples/example1/example1_msvc.visualdproj
rename to examples/example1/example1-msvc.visualdproj
index 45fca2c6..4557b38b 100644
--- a/examples/example1/example1_msvc.visualdproj
+++ b/examples/example1/example1-msvc.visualdproj
@@ -53,7 +53,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -72,7 +72,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids>EmbedStandardResources Unicode USE_FREETYPE USE_OPENGL </versionids>
+  <versionids>EmbedStandardResources Unicode ForceLogs</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
@@ -116,8 +116,8 @@
   <verbose>0</verbose>
   <vtls>0</vtls>
   <vgc>0</vgc>
-  <symdebug>0</symdebug>
-  <optimize>1</optimize>
+  <symdebug>1</symdebug>
+  <optimize>0</optimize>
   <cpu>0</cpu>
   <isX86_64>0</isX86_64>
   <isLinux>0</isLinux>
@@ -136,8 +136,8 @@
   <noboundscheck>0</noboundscheck>
   <useSwitchError>0</useSwitchError>
   <useUnitTests>0</useUnitTests>
-  <useInline>1</useInline>
-  <release>1</release>
+  <useInline>0</useInline>
+  <release>0</release>
   <preservePaths>0</preservePaths>
   <warnings>0</warnings>
   <infowarnings>0</infowarnings>
@@ -155,7 +155,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -174,7 +174,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids>EmbedStandardResources Unicode USE_FREETYPE USE_OPENGL </versionids>
+  <versionids>EmbedStandardResources Unicode ForceLogs</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
@@ -257,7 +257,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -276,7 +276,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids>EmbedStandardResources Unicode USE_FREETYPE USE_OPENGL </versionids>
+  <versionids>EmbedStandardResources Unicode ForceLogs</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
@@ -359,7 +359,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -378,7 +378,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids>EmbedStandardResources Unicode USE_FREETYPE USE_OPENGL </versionids>
+  <versionids>EmbedStandardResources Unicode ForceLogs</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
diff --git a/examples/example1/example1.visualdproj b/examples/example1/example1.visualdproj
deleted file mode 100644
index 1a52df92..00000000
--- a/examples/example1/example1.visualdproj
+++ /dev/null
@@ -1,210 +0,0 @@
-<DProject>
- <ProjectGuid>{68C78CC1-6176-4C60-B4B6-520475C26D23}</ProjectGuid>
- <Config name="Debug" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>0</lib>
-  <subsystem>2</subsystem>
-  <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>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>0</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <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>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath>views views/res views/res/i18n views/res/mdpi</fileImppath>
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids>DebugFocus FontResources</debugids>
-  <versionlevel>0</versionlevel>
-  <versionids>EmbedStandardResources Unicode  USE_FREETYPE</versionids>
-  <dump_source>0</dump_source>
-  <mapverbosity>0</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>1</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles>dlangui.lib phobos.lib ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib</libfiles>
-  <libpaths>../../Debug</libpaths>
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).exe</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <cRuntime>2</cRuntime>
-  <privatePhobos>0</privatePhobos>
-  <additionalOptions>-profile</additionalOptions>
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Config name="Release" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>0</lib>
-  <subsystem>2</subsystem>
-  <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>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>1</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <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>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath>views views/res views/res/i18n views/res/mdpi</fileImppath>
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids />
-  <versionlevel>0</versionlevel>
-  <versionids>EmbedStandardResources Unicode  USE_FREETYPE</versionids>
-  <dump_source>0</dump_source>
-  <mapverbosity>0</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>0</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles>dlangui.lib phobos.lib ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib</libfiles>
-  <libpaths>../../Release ../../3rdparty/libpng/lib 3rdparty/libpng/lib</libpaths>
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).exe</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <cRuntime>1</cRuntime>
-  <privatePhobos>0</privatePhobos>
-  <additionalOptions />
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Folder name="example1">
-  <File path="src\example1.d" />
- </Folder>
-</DProject>
diff --git a/examples/helloworld/helloworld-monod-osx.dproj b/examples/helloworld/helloworld-monod-osx.dproj
new file mode 100644
index 00000000..9f335f31
--- /dev/null
+++ b/examples/helloworld/helloworld-monod-osx.dproj
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <ProjectGuid>{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}</ProjectGuid>
+    <Compiler>DMD2</Compiler>
+    <PreferOneStepBuild>true</PreferOneStepBuild>
+    <UseDefaultCompiler>true</UseDefaultCompiler>
+    <IncrementalLinking>true</IncrementalLinking>
+    <Includes>
+      <Includes>
+        <Path>../../src</Path>
+        <Path>../../deps/dlib</Path>
+        <Path>../../deps/gl3n</Path>
+        <Path>../../deps/DerelictGL3/source</Path>
+        <Path>../../deps/DerelictSDL2/source</Path>
+        <Path>../../deps/DerelictFT/source</Path>
+        <Path>../../deps/DerelictUtil/source</Path>
+      </Includes>
+    </Includes>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug</OutputPath>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_SDL</String>
+        <String>USE_OPENGL</String>
+        <String>USE_FREETYPE</String>
+        <String>EmbedStandardResources</String>
+      </VersionIds>
+    </VersionIds>
+    <ObjectsDirectory>obj/Debug</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <UnittestMode>false</UnittestMode>
+    <OutputName>helloworld-monod-osx</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\Release</OutputPath>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_SDL</String>
+        <String>USE_OPENGL</String>
+        <String>USE_FREETYPE</String>
+        <String>EmbedStandardResources</String>
+      </VersionIds>
+    </VersionIds>
+    <ObjectsDirectory>obj/Release</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <UnittestMode>false</UnittestMode>
+    <OutputName>helloworld-monod-osx</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Unittest</OutputPath>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_SDL</String>
+        <String>USE_OPENGL</String>
+        <String>USE_FREETYPE</String>
+        <String>EmbedStandardResources</String>
+      </VersionIds>
+    </VersionIds>
+    <ObjectsDirectory>obj/Unittest</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <UnittestMode>true</UnittestMode>
+    <OutputName>helloworld-monod-osx</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="src\helloworld.d" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/helloworld/helloworld-monod-windows.dproj b/examples/helloworld/helloworld-monod-windows.dproj
new file mode 100644
index 00000000..41636412
--- /dev/null
+++ b/examples/helloworld/helloworld-monod-windows.dproj
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <ProjectGuid>{5EB161E7-0DB3-459F-86C5-32A84A3F4334}</ProjectGuid>
+    <Compiler>DMD2</Compiler>
+    <PreferOneStepBuild>true</PreferOneStepBuild>
+    <UseDefaultCompiler>true</UseDefaultCompiler>
+    <IncrementalLinking>true</IncrementalLinking>
+    <DependentProjectIds>
+      <DependentProjectIds>
+        <String>{45FB40CD-E99A-4C12-AC52-C13364412E09}</String>
+      </DependentProjectIds>
+    </DependentProjectIds>
+    <Includes>
+      <Includes>
+        <Path>..\..\src</Path>
+        <Path>..\..\deps\DerelictFT\source</Path>
+        <Path>..\..\deps\DerelictSDL2\source</Path>
+        <Path>..\..\deps\DerelictGL3\source</Path>
+        <Path>..\..\deps\DerelictUtil\source</Path>
+        <Path>..\..\deps\gl3n</Path>
+        <Path>..\..\deps\dlib</Path>
+      </Includes>
+    </Includes>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug</OutputPath>
+    <Target>Executable</Target>
+    <OutputName>helloworld-monod-windows</OutputName>
+    <UnittestMode>false</UnittestMode>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Debug</ObjectsDirectory>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+        <String>windows</String>
+      </VersionIds>
+    </VersionIds>
+    <DebugLevel>0</DebugLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\Release</OutputPath>
+    <Target>Executable</Target>
+    <OutputName>helloworld-monod-windows</OutputName>
+    <UnittestMode>false</UnittestMode>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Release</ObjectsDirectory>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+        <String>windows</String>
+      </VersionIds>
+    </VersionIds>
+    <DebugLevel>0</DebugLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Unittest</OutputPath>
+    <Externalconsole>true</Externalconsole>
+    <Target>Executable</Target>
+    <OutputName>helloworld-monod-windows</OutputName>
+    <UnittestMode>true</UnittestMode>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Unittest</ObjectsDirectory>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+        <String>windows</String>
+      </VersionIds>
+    </VersionIds>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="src\helloworld.d" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="src\win_app.def" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/helloworld/helloworld_msvc.visualdproj b/examples/helloworld/helloworld-msvc.visualdproj
similarity index 90%
rename from examples/helloworld/helloworld_msvc.visualdproj
rename to examples/helloworld/helloworld-msvc.visualdproj
index 78ac4680..1682169e 100644
--- a/examples/helloworld/helloworld_msvc.visualdproj
+++ b/examples/helloworld/helloworld-msvc.visualdproj
@@ -53,7 +53,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -155,7 +155,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -257,7 +257,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -359,7 +359,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
diff --git a/examples/helloworld/helloworld.dproj b/examples/helloworld/helloworld.dproj
deleted file mode 100644
index 94a69beb..00000000
--- a/examples/helloworld/helloworld.dproj
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}</ProjectGuid>
-    <UseDefaultCompiler>true</UseDefaultCompiler>
-    <IncrementalLinking>true</IncrementalLinking>
-    <PreferOneStepBuild>true</PreferOneStepBuild>
-    <DependentProjectIds>
-      <DependentProjectIds>
-        <String>{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}</String>
-      </DependentProjectIds>
-    </DependentProjectIds>
-    <Compiler>DMD</Compiler>
-    <Includes>
-      <Includes>
-        <Path>/home/lve/src/d/dlangui/src</Path>
-        <Path>/home/lve/src/d/DerelictGL3/source</Path>
-        <Path>/home/lve/src/d/DerelictUtil/source</Path>
-        <Path>/home/lve/src/d/DerelictFT/source</Path>
-        <Path>/home/lve/src/d/X11.d</Path>
-        <Path>/home/lve/src/d/dlangui/3rdparty/libpng/source</Path>
-        <Path>/home/lve/src/d/dlangui/3rdparty/libpng/lib</Path>
-      </Includes>
-    </Includes>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug</OutputPath>
-    <OutputName>helloworld</OutputName>
-    <ObjectsDirectory>obj/Debug</ObjectsDirectory>
-    <Externalconsole>true</Externalconsole>
-    <Target>Executable</Target>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release</OutputPath>
-    <OutputName>dlanguilib</OutputName>
-    <ObjectsDirectory>obj/Release</ObjectsDirectory>
-    <Externalconsole>true</Externalconsole>
-    <Target>Executable</Target>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Unittest</OutputPath>
-    <ExtraCompilerArguments>-unittest </ExtraCompilerArguments>
-    <ObjectsDirectory>obj/Unittest</ObjectsDirectory>
-    <OutputName>dlanguilib</OutputName>
-    <Externalconsole>true</Externalconsole>
-    <Target>Executable</Target>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="src/helloworld.d" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/helloworld/helloworld.visualdproj b/examples/helloworld/helloworld.visualdproj
deleted file mode 100644
index 7b835226..00000000
--- a/examples/helloworld/helloworld.visualdproj
+++ /dev/null
@@ -1,194 +0,0 @@
-<DProject>
- <ProjectGuid>{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}</ProjectGuid>
- <Config name="Debug" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>0</lib>
-  <subsystem>2</subsystem>
-  <multiobj>0</multiobj>
-  <singleFileCompilation>0</singleFileCompilation>
-  <oneobj>0</oneobj>
-  <trace>0</trace>
-  <quiet>0</quiet>
-  <verbose>0</verbose>
-  <vtls>0</vtls>
-  <symdebug>1</symdebug>
-  <optimize>0</optimize>
-  <cpu>0</cpu>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>0</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <nofloat>0</nofloat>
-  <Dversion>2</Dversion>
-  <ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
-  <compiler>0</compiler>
-  <otherDMD>0</otherDMD>
-  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source  $(SolutionDir)/../DerelictSDL2/source  $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath />
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids />
-  <versionlevel>0</versionlevel>
-  <versionids>Unicode</versionids>
-  <dump_source>0</dump_source>
-  <mapverbosity>3</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>1</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles>dlangui.lib phobos.lib ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib dlangui.lib</libfiles>
-  <libpaths>../../Debug ../../../DerelictOpenGL3/source</libpaths>
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).exe</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <additionalOptions>-profile</additionalOptions>
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Config name="Release" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>0</lib>
-  <subsystem>2</subsystem>
-  <multiobj>0</multiobj>
-  <singleFileCompilation>0</singleFileCompilation>
-  <oneobj>0</oneobj>
-  <trace>0</trace>
-  <quiet>0</quiet>
-  <verbose>0</verbose>
-  <vtls>0</vtls>
-  <symdebug>0</symdebug>
-  <optimize>0</optimize>
-  <cpu>0</cpu>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>1</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <nofloat>0</nofloat>
-  <Dversion>2</Dversion>
-  <ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
-  <compiler>0</compiler>
-  <otherDMD>0</otherDMD>
-  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>../../src ../../3rdparty ../../3rdparty/libpng/source  $(SolutionDir)/../dlib</imppath>
-  <fileImppath />
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids />
-  <versionlevel>0</versionlevel>
-  <versionids>Unicode</versionids>
-  <dump_source>0</dump_source>
-  <mapverbosity>0</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>0</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles>dlangui.lib phobos.lib ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib</libfiles>
-  <libpaths>../../Release </libpaths>
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).exe</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <additionalOptions />
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Folder name="helloworld">
-  <File path="src/helloworld.d" />
- </Folder>
-</DProject>
diff --git a/examples/tetris/tetris-monod-osx.dproj b/examples/tetris/tetris-monod-osx.dproj
new file mode 100644
index 00000000..55746155
--- /dev/null
+++ b/examples/tetris/tetris-monod-osx.dproj
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <ProjectGuid>{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}</ProjectGuid>
+    <Compiler>DMD2</Compiler>
+    <PreferOneStepBuild>true</PreferOneStepBuild>
+    <UseDefaultCompiler>true</UseDefaultCompiler>
+    <IncrementalLinking>true</IncrementalLinking>
+    <DependentProjectIds>
+      <DependentProjectIds>
+        <String>{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}</String>
+      </DependentProjectIds>
+    </DependentProjectIds>
+    <Includes>
+      <Includes>
+        <Path>../../src</Path>
+        <Path>../../deps/dlib</Path>
+        <Path>../../deps/gl3n</Path>
+        <Path>../../deps/DerelictGL3/source</Path>
+        <Path>../../deps/DerelictSDL2/source</Path>
+        <Path>../../deps/DerelictFT/source</Path>
+        <Path>../../deps/DerelictUtil/source</Path>
+      </Includes>
+    </Includes>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug</OutputPath>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_SDL</String>
+        <String>USE_OPENGL</String>
+        <String>USE_FREETYPE</String>
+        <String>EmbedStandardResources</String>
+      </VersionIds>
+    </VersionIds>
+    <ObjectsDirectory>obj/Debug</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <UnittestMode>false</UnittestMode>
+    <OutputName>tetris-monod-osx</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\Release</OutputPath>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_SDL</String>
+        <String>USE_OPENGL</String>
+        <String>USE_FREETYPE</String>
+        <String>EmbedStandardResources</String>
+      </VersionIds>
+    </VersionIds>
+    <ObjectsDirectory>obj/Release</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <UnittestMode>false</UnittestMode>
+    <OutputName>tetris-monod-osx</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Unittest</OutputPath>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_SDL</String>
+        <String>USE_OPENGL</String>
+        <String>USE_FREETYPE</String>
+        <String>EmbedStandardResources</String>
+      </VersionIds>
+    </VersionIds>
+    <ObjectsDirectory>obj/Unittest</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
+    <UnittestMode>true</UnittestMode>
+    <OutputName>tetris-monod-osx</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="src\gui.d" />
+    <Compile Include="src\model.d" />
+    <Compile Include="src\tetris.d" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/tetris/tetris-monod-windows.dproj b/examples/tetris/tetris-monod-windows.dproj
new file mode 100644
index 00000000..9ee1cec5
--- /dev/null
+++ b/examples/tetris/tetris-monod-windows.dproj
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <ProjectGuid>{55D1FE26-E1FC-4787-9E22-D6385BA7C066}</ProjectGuid>
+    <Compiler>DMD2</Compiler>
+    <PreferOneStepBuild>true</PreferOneStepBuild>
+    <UseDefaultCompiler>true</UseDefaultCompiler>
+    <IncrementalLinking>true</IncrementalLinking>
+    <DependentProjectIds>
+      <DependentProjectIds>
+        <String>{45FB40CD-E99A-4C12-AC52-C13364412E09}</String>
+      </DependentProjectIds>
+    </DependentProjectIds>
+    <Includes>
+      <Includes>
+        <Path>..\..\src</Path>
+        <Path>..\..\deps\DerelictFT\source</Path>
+        <Path>..\..\deps\DerelictSDL2\source</Path>
+        <Path>..\..\deps\DerelictGL3\source</Path>
+        <Path>..\..\deps\DerelictUtil\source</Path>
+        <Path>..\..\deps\gl3n</Path>
+        <Path>..\..\deps\dlib</Path>
+      </Includes>
+    </Includes>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug</OutputPath>
+    <Target>Executable</Target>
+    <OutputName>tetris-monod-windows</OutputName>
+    <UnittestMode>false</UnittestMode>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Debug</ObjectsDirectory>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+        <String>windows</String>
+      </VersionIds>
+    </VersionIds>
+    <DebugLevel>0</DebugLevel>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\Release</OutputPath>
+    <Target>Executable</Target>
+    <OutputName>tetris-monod-windows</OutputName>
+    <UnittestMode>false</UnittestMode>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Release</ObjectsDirectory>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+      </VersionIds>
+    </VersionIds>
+    <DebugLevel>0</DebugLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Unittest</OutputPath>
+    <Externalconsole>true</Externalconsole>
+    <Target>Executable</Target>
+    <OutputName>tetris-monod-windows</OutputName>
+    <UnittestMode>true</UnittestMode>
+    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+    <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
+    <ObjectsDirectory>obj\Unittest</ObjectsDirectory>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_FREETYPE</String>
+        <String>USE_OPENGL</String>
+        <String>EmbedStandardResources</String>
+        <String>Unicode</String>
+      </VersionIds>
+    </VersionIds>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="src\gui.d" />
+    <Compile Include="src\model.d" />
+    <Compile Include="src\tetris.d" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="src\win_app.def" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/tetris/tetris_msvc.visualdproj b/examples/tetris/tetris-msvc.visualdproj
similarity index 90%
rename from examples/tetris/tetris_msvc.visualdproj
rename to examples/tetris/tetris-msvc.visualdproj
index a7d470cb..57fc3185 100644
--- a/examples/tetris/tetris_msvc.visualdproj
+++ b/examples/tetris/tetris-msvc.visualdproj
@@ -53,7 +53,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -155,7 +155,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -257,7 +257,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
@@ -359,7 +359,7 @@
   <cccmd>$(CC) -c</cccmd>
   <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
   <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
diff --git a/examples/tetris/tetris.visualdproj b/examples/tetris/tetris.visualdproj
deleted file mode 100644
index 8f9ca642..00000000
--- a/examples/tetris/tetris.visualdproj
+++ /dev/null
@@ -1,210 +0,0 @@
-<DProject>
- <ProjectGuid>{68C78CAD-6176-4C60-B4A5-520475C26D56}</ProjectGuid>
- <Config name="Debug" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>0</lib>
-  <subsystem>2</subsystem>
-  <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>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>0</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <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>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source    $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath>views views/res views/mdpi views/i18n</fileImppath>
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids />
-  <versionlevel>0</versionlevel>
-  <versionids>Unicode USE_FREETYPE USE_OPENGL</versionids>
-  <dump_source>0</dump_source>
-  <mapverbosity>3</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>1</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles>dlangui.lib phobos.lib ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib dlangui.lib</libfiles>
-  <libpaths>../../Debug</libpaths>
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).exe</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <cRuntime>2</cRuntime>
-  <additionalOptions>-profile</additionalOptions>
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Config name="Release" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>0</lib>
-  <subsystem>2</subsystem>
-  <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>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>1</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <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>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source    $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath>views views/res views/mdpi views/i18n</fileImppath>
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids />
-  <versionlevel>0</versionlevel>
-  <versionids>Unicode</versionids>
-  <dump_source>0</dump_source>
-  <mapverbosity>0</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>0</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles>dlangui.lib phobos.lib ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib</libfiles>
-  <libpaths>../../Release</libpaths>
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).exe</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <cRuntime>1</cRuntime>
-  <additionalOptions />
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Folder name="tetris">
-  <File path="src\gui.d" />
-  <File path="src\model.d" />
-  <File path="src\tetris.d" />
- </Folder>
-</DProject>
diff --git a/src/dlangui/graphics/glsupport.d b/src/dlangui/graphics/glsupport.d
index 822010a3..c5149fdf 100644
--- a/src/dlangui/graphics/glsupport.d
+++ b/src/dlangui/graphics/glsupport.d
@@ -27,6 +27,22 @@ import std.conv;
 import std.string;
 import std.array;
 
+derelict.util.exception.ShouldThrow gl3MissingSymFunc( string symName ) {
+	import std.algorithm : equal;
+	foreach(s; ["glGetError", "glShaderSource", "glCompileShader", 
+			"glGetShaderiv", "glGetShaderInfoLog", "glGetString", 
+			"glCreateProgram", "glUseProgram", "glDeleteProgram", 
+			"glDeleteShader", "glEnable", "glDisable", "glBlendFunc", 
+			"glUniformMatrix4fv", "glGetAttribLocation", "glGetUniformLocation", 
+			"glGenVertexArrays", "glBindVertexArray", "glBufferData", 
+			"glBindBuffer", "glBufferSubData"]) {
+		if (symName.equal(s)) // Symbol is used
+			return derelict.util.exception.ShouldThrow.Yes;
+	}
+	// Don't throw for unused symbol
+	return derelict.util.exception.ShouldThrow.No;
+}
+
 // utility function to fill 4-float array of vertex colors with converted CR 32bit color
 private void LVGLFillColor(uint color, float * buf, int count) {
     float r = ((color >> 16) & 255) / 255.0f;
@@ -85,8 +101,11 @@ class GLProgram {
     }
     
     private void compatibilityFixes(ref char[] code, GLuint type) {
-        if (glslversionInt < 150)
+        if (glslversionInt < 150) {
             code = replace(code, " texture(", " texture2D(");
+			code = replace(code, "in ", "");
+			code = replace(code, "out ", "");
+		}
     }
     
     private GLuint compileShader(string src, GLuint type) {
@@ -277,11 +296,17 @@ class SolidFillProgram : GLProgram {
 
         matrixLocation = glGetUniformLocation(program, "matrix");
 		checkError("glGetUniformLocation matrix");
+		if (matrixLocation == 0)
+			Log.e("glGetUniformLocation failed for matrixLocation");
         vertexLocation = glGetAttribLocation(program, "vertex");
 		checkError("glGetAttribLocation vertex");
-        colAttrLocation = glGetAttribLocation(program, "colAttr");
+		if (vertexLocation == 0)
+			Log.e("glGetUniformLocation failed for vertexLocation");
+		colAttrLocation = glGetAttribLocation(program, "colAttr");
 		checkError("glGetAttribLocation colAttr");
-        return res && matrixLocation >= 0 && vertexLocation >= 0 && colAttrLocation >= 0;
+		if (colAttrLocation == 0)
+			Log.e("glGetUniformLocation failed for colAttrLocation");
+		return res && matrixLocation >= 0 && vertexLocation >= 0 && colAttrLocation >= 0;
     }
 
     bool execute(float[] vertices, float[] colors) {
diff --git a/src/dlangui/platforms/sdl/sdlapp.d b/src/dlangui/platforms/sdl/sdlapp.d
index a8894125..f8be874f 100644
--- a/src/dlangui/platforms/sdl/sdlapp.d
+++ b/src/dlangui/platforms/sdl/sdlapp.d
@@ -175,7 +175,8 @@ class SDLWindow : Window {
         version(USE_OPENGL) {
             if (_enableOpengl) {
                 Log.i("Trying to create OpenGL 3.2 context");
-                _context = SDL_GL_CreateContext(_win); // Create the actual context and make it current
+				createContext(3, 2);
+                //_context = SDL_GL_CreateContext(_win); // Create the actual context and make it current
                 if (!_context) {
                     Log.e("SDL_GL_CreateContext failed: ", fromStringz(SDL_GetError()));
                     Log.w("trying other versions of OpenGL");
@@ -190,11 +191,17 @@ class SDLWindow : Window {
                     }
                 }
                 if (_context && !_gl3Reloaded) {
-                    DerelictGL3.reload();
-                    _gl3Reloaded = true;
-                    if (!glSupport.valid && !glSupport.initShaders())
-                        _enableOpengl = false;
-                    fixSize();
+					try {
+						DerelictGL3.missingSymbolCallback = &gl3MissingSymFunc;
+						DerelictGL3.reload(GLVersion.GL21, GLVersion.GL40);
+	                    _gl3Reloaded = true;
+	                    if (!glSupport.valid && !glSupport.initShaders())
+	                        _enableOpengl = false;
+	                    fixSize();
+					} catch (derelict.util.exception.SymbolLoadException e) {
+						Log.e("Exception in DerelictGL3.reload ", e);
+						_enableOpengl = false;
+					}
                 }
             }
         }
@@ -1295,6 +1302,7 @@ int sdlmain(string[] args) {
 
     version(USE_OPENGL) {
         try {
+			DerelictGL3.missingSymbolCallback = &gl3MissingSymFunc;
             DerelictGL3.load();
             _enableOpengl = true;
         } catch (Exception e) {
diff --git a/src/dlangui/widgets/styles.d b/src/dlangui/widgets/styles.d
index 74495bc4..96821a98 100644
--- a/src/dlangui/widgets/styles.d
+++ b/src/dlangui/widgets/styles.d
@@ -827,8 +827,8 @@ class Theme : Style {
 		_fontSize = 9 | SIZE_IN_POINTS_FLAG; // TODO: from settings or screen properties / DPI
 		_fontStyle = FONT_STYLE_NORMAL;
 		_fontWeight = 400;
-		//_fontFace = "Arial"; // TODO: from settings
-		_fontFace = "Verdana"; // TODO: from settings
+		_fontFace = "Arial"; // TODO: from settings
+		//_fontFace = "Verdana"; // TODO: from settings
         _fontFamily = FontFamily.SansSerif;
         _minHeight = 0;
         _minWidth = 0;