diff --git a/win32/Contribs.props b/win32/Contribs.props
new file mode 100644
index 00000000..46c41ca2
--- /dev/null
+++ b/win32/Contribs.props
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <ContribDir>$(SolutionDir)\..\contrib</ContribDir>
+    <GtkDir>$(ContribDir)\gtk+-bundle_2.22.1-20101227_win32</GtkDir>
+    <GtkGlDir>$(ContribDir)\gtkglarea</GtkGlDir>
+    <SdlDir>$(ContribDir)\SDL-1.2.14</SdlDir>
+    <SdlImageDir>$(ContribDir)\SDL_image-1.2.10</SdlImageDir>
+    <SdlMixerDir>$(ContribDir)\SDL_mixer-1.2.11</SdlMixerDir>
+    <GtkIncludes>$(GtkDir)\lib\glib-2.0\include;$(GtkDir)\lib\gtk-2.0\include;$(GtkDir)\include\glib-2.0;$(GtkDir)\include\gtk-2.0;$(GtkDir)\include\cairo;$(GtkDir)\include\pango-1.0;$(GtkDir)\include\gdk-pixbuf-2.0;$(GtkDir)\include\atk-1.0;$(GtkGlDir)\include</GtkIncludes>
+    <SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
+    <GtkLibs>$(GtkDir)\lib;$(GtkGlDir)\lib</GtkLibs>
+    <SdlLibs>$(SdlDir)\lib;$(SdlImageDir)\lib;$(SdlMixerDir)\lib</SdlLibs>
+    <GtkDeps>gobject-2.0.lib;gthread-2.0.lib;glib-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;gtkgl-2.0.lib</GtkDeps>
+    <SdlDeps>SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+  <ItemGroup>
+    <BuildMacro Include="ContribDir">
+      <Value>$(ContribDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDir">
+      <Value>$(GtkDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkGlDir">
+      <Value>$(GtkGlDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SdlDir">
+      <Value>$(SdlDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SdlImageDir">
+      <Value>$(SdlImageDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SdlMixerDir">
+      <Value>$(SdlMixerDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkIncludes">
+      <Value>$(GtkIncludes)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SdlIncludes">
+      <Value>$(SdlIncludes)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkLibs">
+      <Value>$(GtkLibs)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SdlLibs">
+      <Value>$(SdlLibs)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDeps">
+      <Value>$(GtkDeps)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SdlDeps">
+      <Value>$(SdlDeps)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/win32/deushax.vcxproj b/win32/deushax.vcxproj
index 8f3b8311..22368d40 100644
--- a/win32/deushax.vcxproj
+++ b/win32/deushax.vcxproj
@@ -99,9 +99,11 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Contribs.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Contribs.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -119,13 +121,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\contrib\SDL_image-1.2.10\include;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\include;$(SolutionDir)\..\contrib\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib;opengl32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)\..\contrib\SDL_image-1.2.10\lib;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\lib;$(SolutionDir)\..\contrib\SDL-1.2.14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);opengl32.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -137,15 +139,15 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\contrib\SDL_image-1.2.10\include;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\include;$(SolutionDir)\..\contrib\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib;opengl32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)\..\contrib\SDL_image-1.2.10\lib;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\lib;$(SolutionDir)\..\contrib\SDL-1.2.14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);opengl32.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/win32/editor.vcxproj b/win32/editor.vcxproj
new file mode 100644
index 00000000..8a327d6e
--- /dev/null
+++ b/win32/editor.vcxproj
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\deushax\gtk\glmapview.h" />
+    <ClInclude Include="..\deushax\mapviewer.h" />
+    <ClInclude Include="..\src\audio.h" />
+    <ClInclude Include="..\src\bitfield.h" />
+    <ClInclude Include="..\src\core.h" />
+    <ClInclude Include="..\src\debugfps.h" />
+    <ClInclude Include="..\src\debugrecord.h" />
+    <ClInclude Include="..\src\debugsphere.h" />
+    <ClInclude Include="..\src\debugstats.h" />
+    <ClInclude Include="..\src\dict.h" />
+    <ClInclude Include="..\src\emitter.h" />
+    <ClInclude Include="..\src\entity.h" />
+    <ClInclude Include="..\src\font.h" />
+    <ClInclude Include="..\src\forge.h" />
+    <ClInclude Include="..\src\input.h" />
+    <ClInclude Include="..\src\layer.h" />
+    <ClInclude Include="..\src\map.h" />
+    <ClInclude Include="..\src\matrix.h" />
+    <ClInclude Include="..\src\numeric.h" />
+    <ClInclude Include="..\src\profiler.h" />
+    <ClInclude Include="..\src\sample.h" />
+    <ClInclude Include="..\src\sampler.h" />
+    <ClInclude Include="..\src\scene.h" />
+    <ClInclude Include="..\src\sdlinput.h" />
+    <ClInclude Include="..\src\text.h" />
+    <ClInclude Include="..\src\ticker.h" />
+    <ClInclude Include="..\src\tiler.h" />
+    <ClInclude Include="..\src\tileset.h" />
+    <ClInclude Include="..\src\timer.h" />
+    <ClInclude Include="..\src\video.h" />
+    <ClInclude Include="..\src\worldentity.h" />
+    <ClInclude Include="..\src\world.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\deushax\gtk\editor.cpp" />
+    <ClCompile Include="..\deushax\gtk\glmapview.cpp" />
+    <ClCompile Include="..\deushax\mapviewer.cpp" />
+    <ClCompile Include="..\src\audio.cpp" />
+    <ClCompile Include="..\src\debugfps.cpp" />
+    <ClCompile Include="..\src\debugrecord.cpp" />
+    <ClCompile Include="..\src\debugsphere.cpp" />
+    <ClCompile Include="..\src\debugstats.cpp" />
+    <ClCompile Include="..\src\dict.cpp" />
+    <ClCompile Include="..\src\emitter.cpp" />
+    <ClCompile Include="..\src\entity.cpp" />
+    <ClCompile Include="..\src\font.cpp" />
+    <ClCompile Include="..\src\forge.cpp" />
+    <ClCompile Include="..\src\input.cpp" />
+    <ClCompile Include="..\src\layer.cpp" />
+    <ClCompile Include="..\src\map.cpp" />
+    <ClCompile Include="..\src\profiler.cpp" />
+    <ClCompile Include="..\src\sample.cpp" />
+    <ClCompile Include="..\src\sampler.cpp" />
+    <ClCompile Include="..\src\scene.cpp" />
+    <ClCompile Include="..\src\sdlinput.cpp" />
+    <ClCompile Include="..\src\text.cpp" />
+    <ClCompile Include="..\src\ticker.cpp" />
+    <ClCompile Include="..\src\tiler.cpp" />
+    <ClCompile Include="..\src\tileset.cpp" />
+    <ClCompile Include="..\src\timer.cpp" />
+    <ClCompile Include="..\src\video.cpp" />
+    <ClCompile Include="..\src\world.cpp" />
+    <ClCompile Include="..\src\worldentity.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9C66B179-0737-4BDA-AB42-2ADE478A9008}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>testmap</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Contribs.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Contribs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IntDir>Debug\$(ProjectName)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>Release\$(ProjectName)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GtkDeps);opengl32.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SdlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GtkDeps);opengl32.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SdlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/win32/editor.vcxproj.filters b/win32/editor.vcxproj.filters
new file mode 100644
index 00000000..f11cc135
--- /dev/null
+++ b/win32/editor.vcxproj.filters
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="lolengine">
+      <UniqueIdentifier>{755186eb-cee6-4c2e-822f-24e728ac6fb8}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\bitfield.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\core.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\debugfps.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\debugrecord.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\debugsphere.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\debugstats.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\dict.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\emitter.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\entity.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\font.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\forge.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\input.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\layer.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\map.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\matrix.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\numeric.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\profiler.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\scene.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\sdlinput.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\text.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\ticker.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\tiler.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\tileset.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\timer.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\video.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\worldentity.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\world.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\sampler.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\sample.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\audio.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\deushax\gtk\glmapview.h" />
+    <ClInclude Include="..\deushax\mapviewer.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\debugfps.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\debugrecord.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\debugsphere.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\debugstats.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\dict.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\emitter.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\entity.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\font.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\forge.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\input.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\layer.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\map.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\profiler.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\scene.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\sdlinput.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\text.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\ticker.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\tiler.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\tileset.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\timer.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\video.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\world.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\worldentity.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\sample.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\sampler.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\audio.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\deushax\gtk\editor.cpp" />
+    <ClCompile Include="..\deushax\gtk\glmapview.cpp" />
+    <ClCompile Include="..\deushax\mapviewer.cpp" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/lolengine.sln b/win32/lolengine.sln
index a3862185..3bb80c21 100644
--- a/win32/lolengine.sln
+++ b/win32/lolengine.sln
@@ -5,6 +5,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "deushax.vcxproj"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -19,6 +21,10 @@ Global
 		{17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Win32.Build.0 = Debug|Win32
 		{17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.ActiveCfg = Release|Win32
 		{17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.Build.0 = Release|Win32
+		{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.Build.0 = Debug|Win32
+		{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.ActiveCfg = Release|Win32
+		{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win32/monsterz.vcxproj b/win32/monsterz.vcxproj
index 77d64dc2..bc263909 100644
--- a/win32/monsterz.vcxproj
+++ b/win32/monsterz.vcxproj
@@ -104,9 +104,11 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Contribs.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Contribs.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -124,13 +126,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\contrib\SDL_image-1.2.10\include;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\include;$(SolutionDir)\..\contrib\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib;opengl32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)\..\contrib\SDL_image-1.2.10\lib;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\lib;$(SolutionDir)\..\contrib\SDL-1.2.14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);opengl32.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -142,15 +144,15 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\contrib\SDL_image-1.2.10\include;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\include;$(SolutionDir)\..\contrib\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib;opengl32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)\..\contrib\SDL_image-1.2.10\lib;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\lib;$(SolutionDir)\..\contrib\SDL-1.2.14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);opengl32.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />