diff --git a/win32/set_env.bat b/win32/set_env.bat
index eef27b8..cd053ee 100644
--- a/win32/set_env.bat
+++ b/win32/set_env.bat
@@ -1,7 +1,7 @@
 @echo off
 
 rem Set external libraries directory.
-set EXT_DIR=%cd%\..\..\..\..\extern
+set EXT_DIR=%cd%\..\..\..\extern
 
 if not exist %EXT_DIR% (
 	set EXT_DIR=
@@ -15,16 +15,17 @@ set INCLUDE=%EXT_DIR%\include;%INCLUDE%
 set LIB=%EXT_DIR%\lib;%LIB%
 
 rem Add Evil lib path
-set EvilInclude=%cd%\..\..\proto\evil\src\lib
-set EvilCommon=%cd%\..\..\proto\evil\win32\common
-set EvilOut=%cd%\..\..\proto\evil\win32\%PROJECT_TYPE%\out
+set EvilInclude=%cd%\..\..\evil\src\lib
+set EvilCommon=%cd%\..\..\evil\win32\common
+set EvilOut=%cd%\..\..\evil\win32\%PROJECT_TYPE%\out
 
 rem Add Evas lib path
 set EvasOut=%cd%\..\..\evas\win32\%PROJECT_TYPE%\out
 set EvasDirect3DInclude=%cd%\..\..\evas\src\modules\engines\direct3d
 set EvasGLGlewInclude=%cd%\..\..\evas\src\modules\engines\gl_glew
 set EvasDDrawInclude=%cd%\..\..\evas\src\modules\engines\software_ddraw
-set EvasInclude=%EvasDDrawInclude%;%EvasGLGlewInclude%;%EvasDirect3DInclude%;%cd%\..\..\evas\src\lib
+set EvasGDIInclude=%cd%\..\..\evas\src\modules\engines\software_gdi
+set EvasInclude=%EvasGDIInclude%;%EvasDDrawInclude%;%EvasGLGlewInclude%;%EvasDirect3DInclude%;%cd%\..\..\evas\src\lib
 
 rem Add Eina lib path
 set EinaInclude=%cd%\..\..\eina\src\include
diff --git a/win32/vs8/expedite.vcproj b/win32/vs8/expedite.vcproj
index a9bb932..d98798b 100644
--- a/win32/vs8/expedite.vcproj
+++ b/win32/vs8/expedite.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="$(INCLUDE)"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_EVIL;__CRT_INLINE=__inline;snprintf=_snprintf_c;PACKAGE_DATA_DIR=;HAVE_EVAS_DIRECT3D;HAVE_EVAS_OPENGL_GLEW"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_EVIL;__CRT_INLINE=__inline;inline=__inline;snprintf=_snprintf_c;PACKAGE_DATA_DIR=;HAVE_EVAS_DIRECT3D;HAVE_EVAS_SOFTWARE_GDI;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="eina.lib libevas.lib d3d9.lib d3dx9.lib ddraw.lib opengl32.lib glew32.lib"
+				AdditionalDependencies="eina.lib libevas.lib d3d9.lib d3dx9.lib ddraw.lib gdi32.lib user32.lib"
 				OutputFile="$(OutDir)\expedite.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="$(INCLUDE)"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_EVIL;__CRT_INLINE=__inline;snprintf=_snprintf_c;PACKAGE_DATA_DIR=;HAVE_EVAS_DIRECT3D;HAVE_EVAS_OPENGL_GLEW"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_EVIL;__CRT_INLINE=__inline;inline=__inline;snprintf=_snprintf_c;PACKAGE_DATA_DIR=;HAVE_EVAS_DIRECT3D;HAVE_EVAS_SOFTWARE_GDI;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -138,7 +138,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="eina.lib libevas.lib d3d9.lib d3dx9.lib ddraw.lib opengl32.lib glew32.lib"
+				AdditionalDependencies="eina.lib libevas.lib d3d9.lib d3dx9.lib ddraw.lib gdi32.lib user32.lib"
 				OutputFile="$(OutDir)\expedite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
@@ -233,6 +233,42 @@
 			<File
 				RelativePath="..\..\src\bin\engine_gl_glew.c"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\engine_gl_sdl.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\bin\engine_gl_x11.c"
@@ -334,6 +370,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\src\bin\engine_software_gdi.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\bin\engine_software_sdl.c"
 				>
@@ -402,6 +442,14 @@
 				RelativePath="..\..\src\bin\image_blend_border_recolor.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\bin\image_blend_fade_pow2_unscaled.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_blend_fade_unscaled.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\bin\image_blend_nearest_same_scaled.c"
 				>
@@ -486,6 +534,22 @@
 				RelativePath="..\..\src\bin\image_blend_solid_border.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\bin\image_blend_solid_fade_pow2_unscaled.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_blend_solid_fade_unscaled.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_blend_solid_middle_border.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_blend_solid_middle_unscaled.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\bin\image_blend_solid_unscaled.c"
 				>
@@ -514,6 +578,82 @@
 				RelativePath="..\..\src\bin\image_data_ycbcr601pl_wide_stride.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_3d_1.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_3d_2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_3d_3.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_3d_4.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_3d_5.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_3d_6.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_3d_flow.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_color_alpha_nearest_rotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_color_alpha_nearest_solid_rotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_color_alpha_rotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_color_alpha_solid_rotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_color_nearest_rotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_color_nearest_solid_rotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_color_rotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_color_solid_rotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_nearest_rotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_nearest_solid_rotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_rotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\image_map_solid_rotate.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\bin\image_quality_scale.c"
 				>
@@ -534,6 +674,14 @@
 				RelativePath="..\..\src\bin\rect_blend_few.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\bin\rect_blend_pow2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\rect_blend_pow2_few.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\bin\rect_solid.c"
 				>
@@ -570,6 +718,22 @@
 				RelativePath="..\..\src\bin\ui.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\bin\widgets_file_icons.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\widgets_file_icons_2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\widgets_file_icons_3.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bin\widgets_file_icons_4.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -616,6 +780,10 @@
 				RelativePath="..\..\src\bin\engine_software_ddraw.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\bin\engine_software_gdi.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\bin\engine_software_sdl.h"
 				>