diff --git a/desmume/src/windows/DeSmuME_Intel.icproj b/desmume/src/windows/DeSmuME_Intel.icproj
index 1db8d4b5f..316826a1c 100644
--- a/desmume/src/windows/DeSmuME_Intel.icproj
+++ b/desmume/src/windows/DeSmuME_Intel.icproj
@@ -3,9 +3,9 @@
 	ProjectType="Intel C++ Project"
 	Version="10.1"
 	Name="DeSmuME_Intel"
-	ProjectGUID="{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}"
+	ProjectGUID="{439F53E2-431F-4F28-9058-C6A9B00B503F}"
 	VCNestedProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
-	VCNestedProjectCRC32="2055535478"
+	VCNestedProjectCRC32="996184373"
 	VCNestedProjectFileName="DeSmuME_Intel.vcproj">
 	<Platforms>
 		<Platform 
@@ -28,24 +28,25 @@
 				EnableIntrinsicFunctions="0"
 				FavorSizeOrSpeed="0"
 				EnableFiberSafeOptimizations="0"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
+				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig"
+				PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;EXPERIMENTAL_WIFI"
 				ExceptionHandling="1"
 				BufferSecurityCheck="0"
-				EnableEnhancedInstructionSet="0"
+				EnableEnhancedInstructionSet="2"
 				DebugInformationFormat="4"
-				CallingConvention="1"
+				CallingConvention="0"
 				CompileAs="0"/>
 			<Tool 
 				Name="LinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib;.\winpcap"
+				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib zlib-2008-x32.lib zziplib-2008-x32.lib"
+				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="1"
 				GenerateMapFile="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				DelayImpLib=""/>
+				DelayImpLib="DelayImp.lib"/>
 			<Tool 
 				Name="LibrarianTool"/>
 			<Tool 
@@ -68,7 +69,7 @@
 				Name="MASM"/>
 		</Configuration>
 		<Configuration 
-			Name="Interim SSE2|Win32">
+			Name="Release|Win32">
 			<Tool 
 				Name="GeneralTool"
 				OutputDirectory="$(SolutionDir)\__bins"
@@ -87,194 +88,8 @@
 				OmitFramePointers="1"
 				EnableFiberSafeOptimizations="1"
 				OptimizeForWindowsApplication="1"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
-				StringPooling="1"
-				ExceptionHandling="1"
-				StructMemberAlignment="0"
-				BufferSecurityCheck="0"
-				EnableEnhancedInstructionSet="2"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-				CompileAs="0"
-				UseProcExt="5"
-				Parallelization="1"/>
-			<Tool 
-				Name="LinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName)_interim_sse2.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
-				GenerateDebugInformation="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				Profile="0"
-				DelayImpLib=""/>
-			<Tool 
-				Name="LibrarianTool"/>
-			<Tool 
-				Name="ResCmplrTool"/>
-			<Tool 
-				Name="MidlCmplrTool"/>
-			<Tool 
-				Name="BscMakeTool"/>
-			<Tool 
-				Name="PreBuildEventTool"/>
-			<Tool 
-				Name="PreLinkEventTool"/>
-			<Tool 
-				Name="PostBuildEventTool"/>
-			<Tool 
-				Name="CustomTool"/>
-			<Tool 
-				Name="CustomNodeTool"/>
-			<Tool 
-				Name="MASM"/>
-		</Configuration>
-		<Configuration 
-			Name="Interim|Win32">
-			<Tool 
-				Name="GeneralTool"
-				OutputDirectory="$(SolutionDir)\__bins"
-				IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
-				ConfigurationType="1"
-				WholeProgramOptimization="1"
-				InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"/>
-			<Tool 
-				Name="CppCmplrTool"
-				WholeProgramOptimization="1"
-				Optimization="1000"
-				GlobalOptimizations="1"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="1"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="1"
-				EnableFiberSafeOptimizations="1"
-				OptimizeForWindowsApplication="1"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
-				StringPooling="1"
-				ExceptionHandling="1"
-				BufferSecurityCheck="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-				CompileAs="0"
-				Parallelization="1"/>
-			<Tool 
-				Name="LinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName)_interim.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
-				GenerateDebugInformation="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				Profile="1"
-				DelayImpLib=""/>
-			<Tool 
-				Name="LibrarianTool"/>
-			<Tool 
-				Name="ResCmplrTool"/>
-			<Tool 
-				Name="MidlCmplrTool"/>
-			<Tool 
-				Name="BscMakeTool"/>
-			<Tool 
-				Name="PreBuildEventTool"/>
-			<Tool 
-				Name="PreLinkEventTool"/>
-			<Tool 
-				Name="PostBuildEventTool"/>
-			<Tool 
-				Name="CustomTool"/>
-			<Tool 
-				Name="CustomNodeTool"/>
-			<Tool 
-				Name="MASM"/>
-		</Configuration>
-		<Configuration 
-			Name="Release (public)|Win32">
-			<Tool 
-				Name="GeneralTool"
-				OutputDirectory="$(SolutionDir)\__bins"
-				IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
-				ConfigurationType="1"
-				WholeProgramOptimization="1"
-				InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"/>
-			<Tool 
-				Name="CppCmplrTool"
-				WholeProgramOptimization="1"
-				Optimization="1000"
-				GlobalOptimizations="1"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="1"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="1"
-				EnableFiberSafeOptimizations="1"
-				OptimizeForWindowsApplication="1"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SPU_INTERPOLATE;NOMINMAX;RELEASE"
-				StringPooling="1"
-				ExceptionHandling="1"
-				BufferSecurityCheck="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-				CompileAs="0"
-				Parallelization="1"/>
-			<Tool 
-				Name="LinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
-				GenerateDebugInformation="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				Profile="1"
-				DelayImpLib=""/>
-			<Tool 
-				Name="LibrarianTool"/>
-			<Tool 
-				Name="ResCmplrTool"/>
-			<Tool 
-				Name="MidlCmplrTool"/>
-			<Tool 
-				Name="BscMakeTool"/>
-			<Tool 
-				Name="PreBuildEventTool"/>
-			<Tool 
-				Name="PreLinkEventTool"/>
-			<Tool 
-				Name="PostBuildEventTool"/>
-			<Tool 
-				Name="CustomTool"/>
-			<Tool 
-				Name="CustomNodeTool"/>
-			<Tool 
-				Name="MASM"/>
-		</Configuration>
-		<Configuration 
-			Name="Release SSE2 (public)|Win32">
-			<Tool 
-				Name="GeneralTool"
-				OutputDirectory="$(SolutionDir)\__bins"
-				IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
-				ConfigurationType="1"
-				WholeProgramOptimization="1"
-				InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"/>
-			<Tool 
-				Name="CppCmplrTool"
-				WholeProgramOptimization="1"
-				Optimization="1000"
-				GlobalOptimizations="1"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="1"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="1"
-				EnableFiberSafeOptimizations="1"
-				OptimizeForWindowsApplication="1"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE"
+				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE;EXPERIMENTAL_WIFI;NDEBUG"
 				StringPooling="1"
 				ExceptionHandling="1"
 				StructMemberAlignment="0"
@@ -289,13 +104,14 @@
 			<Tool 
 				Name="LinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)_sse2.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				AdditionalDependencies="gdiplus\gdiplus.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib;.\winpcap"
+				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib zlib-2008-x32.lib zziplib-2008-x32.lib"
+				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				Profile="0"
-				DelayImpLib=""/>
+				DelayImpLib="DelayImp.lib"/>
 			<Tool 
 				Name="LibrarianTool"/>
 			<Tool 
@@ -373,6 +189,8 @@
 			RelativePath="..\mic.h"/>
 		<File 
 			RelativePath="..\MMU.h"/>
+		<File 
+			RelativePath="..\movie.h"/>
 		<File 
 			RelativePath="..\NDSSystem.h"/>
 		<File 
@@ -391,6 +209,8 @@
 			RelativePath="..\rtc.h"/>
 		<File 
 			RelativePath="..\saves.h"/>
+		<File 
+			RelativePath="..\shaders.h"/>
 		<File 
 			RelativePath="..\softrender.h"/>
 		<File 
@@ -405,8 +225,12 @@
 			RelativePath="..\types.h"/>
 		<File 
 			RelativePath="..\wifi.h"/>
+		<File 
+			RelativePath=".\userconfig\userconfig.h"/>
 		<File 
 			RelativePath=".\AboutBox.h"/>
+		<File 
+			RelativePath=".\aviout.h"/>
 		<File 
 			RelativePath=".\cheatsWin.h"/>
 		<File 
@@ -423,12 +247,16 @@
 			RelativePath=".\gbaslot_config.h"/>
 		<File 
 			RelativePath=".\ginfo.h"/>
+		<File 
+			RelativePath=".\hotkey.h"/>
 		<File 
 			RelativePath=".\inputdx.h"/>
 		<File 
 			RelativePath=".\IORegView.h"/>
 		<File 
 			RelativePath=".\lightView.h"/>
+		<File 
+			RelativePath=".\main.h"/>
 		<File 
 			RelativePath=".\mapView.h"/>
 		<File 
@@ -439,6 +267,12 @@
 			RelativePath=".\oamView.h"/>
 		<File 
 			RelativePath=".\palView.h"/>
+		<File 
+			RelativePath=".\ram_search.h"/>
+		<File 
+			RelativePath=".\ramwatch.h"/>
+		<File 
+			RelativePath=".\replay.h"/>
 		<File 
 			RelativePath=".\resource.h"/>
 		<File 
@@ -453,6 +287,8 @@
 			RelativePath="..\instruction_tabdef.inc"/>
 		<File 
 			RelativePath="..\thumb_tabdef.inc"/>
+		<File 
+			RelativePath=".\bitmap1.bmp"/>
 		<File 
 			RelativePath=".\DeSmuME.ico"/>
 		<File 
@@ -478,40 +314,7 @@
 					CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#xA;"/>
 			</FileConfiguration>
 			<FileConfiguration 
-				Name="Interim SSE2|Win32">
-				<Tool 
-					Name="GeneralTool"
-					ExcludedFromBuild="1"/>
-				<Tool 
-					Name="CustomTool"
-					Description="Assembling x64..."
-					CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#xA;"
-					Outputs="$(IntDir)\$(InputName).obj"/>
-			</FileConfiguration>
-			<FileConfiguration 
-				Name="Interim|Win32">
-				<Tool 
-					Name="GeneralTool"
-					ExcludedFromBuild="1"/>
-				<Tool 
-					Name="CustomTool"
-					Description="Assembling x64..."
-					CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#xA;"
-					Outputs="$(IntDir)\$(InputName).obj"/>
-			</FileConfiguration>
-			<FileConfiguration 
-				Name="Release (public)|Win32">
-				<Tool 
-					Name="GeneralTool"
-					ExcludedFromBuild="1"/>
-				<Tool 
-					Name="CustomTool"
-					Description="Assembling x64..."
-					CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#xA;"
-					Outputs="$(IntDir)\$(InputName).obj"/>
-			</FileConfiguration>
-			<FileConfiguration 
-				Name="Release SSE2 (public)|Win32">
+				Name="Release|Win32">
 				<Tool 
 					Name="GeneralTool"
 					ExcludedFromBuild="1"/>
@@ -523,26 +326,7 @@
 			</FileConfiguration>
 		</File>
 		<File 
-			RelativePath="..\matrix_sse2-x86.asm">
-			<FileConfiguration 
-				Name="Debug|Win32">
-				<Tool 
-					Name="GeneralTool"
-					ExcludedFromBuild="1"/>
-			</FileConfiguration>
-			<FileConfiguration 
-				Name="Interim|Win32">
-				<Tool 
-					Name="GeneralTool"
-					ExcludedFromBuild="1"/>
-			</FileConfiguration>
-			<FileConfiguration 
-				Name="Release (public)|Win32">
-				<Tool 
-					Name="GeneralTool"
-					ExcludedFromBuild="1"/>
-			</FileConfiguration>
-		</File>
+			RelativePath="..\matrix_sse2-x86.asm"/>
 		<File 
 			RelativePath="..\utils\decrypt\crc.cpp"/>
 		<File 
@@ -609,6 +393,8 @@
 			RelativePath="..\mc.cpp"/>
 		<File 
 			RelativePath="..\MMU.cpp"/>
+		<File 
+			RelativePath="..\movie.cpp"/>
 		<File 
 			RelativePath="..\NDSSystem.cpp"/>
 		<File 
@@ -655,6 +441,8 @@
 			RelativePath=".\gbaslot_config.cpp"/>
 		<File 
 			RelativePath=".\ginfo.cpp"/>
+		<File 
+			RelativePath=".\hotkey.cpp"/>
 		<File 
 			RelativePath=".\inputdx.cpp"/>
 		<File 
@@ -677,6 +465,12 @@
 			RelativePath=".\ogl.cpp"/>
 		<File 
 			RelativePath=".\palView.cpp"/>
+		<File 
+			RelativePath=".\ram_search.cpp"/>
+		<File 
+			RelativePath=".\ramwatch.cpp"/>
+		<File 
+			RelativePath=".\replay.cpp"/>
 		<File 
 			RelativePath=".\snddx.cpp"/>
 		<File 
diff --git a/desmume/src/windows/DeSmuME_Intel.sln b/desmume/src/windows/DeSmuME_Intel.sln
index 415020ed2..4f8f94d10 100644
--- a/desmume/src/windows/DeSmuME_Intel.sln
+++ b/desmume/src/windows/DeSmuME_Intel.sln
@@ -1,35 +1,20 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "DeSmuME_Intel", "DeSmuME_Intel.icproj", "{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}"
+Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "DeSmuME_Intel", "DeSmuME_Intel.icproj", "{439F53E2-431F-4F28-9058-C6A9B00B503F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
-		Interim SSE2|Win32 = Interim SSE2|Win32
-		Interim|Win32 = Interim|Win32
-		Release (public)|Win32 = Release (public)|Win32
-		Release SSE2 (public)|Win32 = Release SSE2 (public)|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Debug|Win32.Build.0 = Debug|Win32
-		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Interim SSE2|Win32.ActiveCfg = Interim SSE2|Win32
-		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Interim SSE2|Win32.Build.0 = Interim SSE2|Win32
-		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Interim|Win32.ActiveCfg = Interim|Win32
-		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Interim|Win32.Build.0 = Interim|Win32
-		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Release (public)|Win32.ActiveCfg = Release (public)|Win32
-		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Release (public)|Win32.Build.0 = Release (public)|Win32
-		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Release SSE2 (public)|Win32.ActiveCfg = Release SSE2 (public)|Win32
-		{3DA70B4E-4FE0-428C-9084-F6CE33810F6B}.Release SSE2 (public)|Win32.Build.0 = Release SSE2 (public)|Win32
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release SSE2 (public)|Win32.Build.0 = Release SSE2 (public)|Win32
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release SSE2 (public)|Win32.ActiveCfg = Release SSE2 (public)|Win32
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release (public)|Win32.Build.0 = Release (public)|Win32
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release (public)|Win32.ActiveCfg = Release (public)|Win32
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Interim|Win32.Build.0 = Interim|Win32
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Interim|Win32.ActiveCfg = Interim|Win32
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Interim SSE2|Win32.Build.0 = Interim SSE2|Win32
-		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Interim SSE2|Win32.ActiveCfg = Interim SSE2|Win32
+		{439F53E2-431F-4F28-9058-C6A9B00B503F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{439F53E2-431F-4F28-9058-C6A9B00B503F}.Debug|Win32.Build.0 = Debug|Win32
+		{439F53E2-431F-4F28-9058-C6A9B00B503F}.Release|Win32.ActiveCfg = Release|Win32
+		{439F53E2-431F-4F28-9058-C6A9B00B503F}.Release|Win32.Build.0 = Release|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.Build.0 = Release|Win32
+		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.ActiveCfg = Release|Win32
 		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.Build.0 = Debug|Win32
 		{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.ActiveCfg = Debug|Win32
 	EndGlobalSection
diff --git a/desmume/src/windows/DeSmuME_Intel.vcproj b/desmume/src/windows/DeSmuME_Intel.vcproj
index 4400feecd..f80ef6d0c 100644
--- a/desmume/src/windows/DeSmuME_Intel.vcproj
+++ b/desmume/src/windows/DeSmuME_Intel.vcproj
@@ -51,13 +51,14 @@
 				FavorSizeOrSpeed="0"
 				EnableFiberSafeOptimizations="false"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
+				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig"
+				PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;EXPERIMENTAL_WIFI"
 				ExceptionHandling="1"
 				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="0"
+				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="2"
 				DebugInformationFormat="4"
-				CallingConvention="1"
+				CallingConvention="0"
 				CompileAs="0"
 			/>
 			<Tool
@@ -71,9 +72,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib"
+				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib zlib-2008-x32.lib zziplib-2008-x32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib;.\winpcap"
+				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
 				RandomizedBaseAddress="1"
@@ -103,7 +105,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Interim SSE2|Win32"
+			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
 			IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
@@ -137,8 +139,8 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
+				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE;EXPERIMENTAL_WIFI;NDEBUG"
 				StringPooling="true"
 				ExceptionHandling="1"
 				StructMemberAlignment="0"
@@ -161,277 +163,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_interim_sse2.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				GenerateDebugInformation="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				Profile="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="DeSmuME_x86.manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Interim|Win32"
-			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX"
-				StringPooling="true"
-				ExceptionHandling="1"
-				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="0"
-				FloatingPointModel="2"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_interim.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				GenerateDebugInformation="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				Profile="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="DeSmuME_x86.manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (public)|Win32"
-			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SPU_INTERPOLATE;NOMINMAX;RELEASE"
-				StringPooling="true"
-				ExceptionHandling="1"
-				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="0"
-				FloatingPointModel="2"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
-				GenerateDebugInformation="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				Profile="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="DeSmuME_x86.manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release SSE2 (public)|Win32"
-			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\.Intel\$(ConfigurationName)\$(PlatformName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE"
-				StringPooling="true"
-				ExceptionHandling="1"
-				StructMemberAlignment="0"
-				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="2"
-				FloatingPointModel="2"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib zlib-2008-x32.lib zziplib-2008-x32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_sse2.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib;.\winpcap"
+				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -544,6 +279,10 @@
 					RelativePath="..\MMU.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\movie.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\NDSSystem.cpp"
 					>
@@ -681,40 +420,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Interim SSE2|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling x64..."
-								CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="$(IntDir)\$(InputName).obj"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Interim|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling x64..."
-								CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="$(IntDir)\$(InputName).obj"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release (public)|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling x64..."
-								CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="$(IntDir)\$(InputName).obj"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release SSE2 (public)|Win32"
+							Name="Release|Win32"
 							ExcludedFromBuild="true"
 							>
 							<Tool
@@ -780,30 +486,6 @@
 					<File
 						RelativePath="..\matrix_sse2-x86.asm"
 						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="MASM"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Interim|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="MASM"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release (public)|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="MASM"
-							/>
-						</FileConfiguration>
 						<FileConfiguration
 							Name="Debug|x64"
 							ExcludedFromBuild="true"
@@ -910,6 +592,10 @@
 					RelativePath=".\ginfo.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\hotkey.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\inputdx.cpp"
 					>
@@ -954,6 +640,18 @@
 					RelativePath=".\palView.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\ram_search.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\ramwatch.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\replay.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\snddx.cpp"
 					>
@@ -992,6 +690,10 @@
 					RelativePath=".\AboutBox.h"
 					>
 				</File>
+				<File
+					RelativePath=".\aviout.h"
+					>
+				</File>
 				<File
 					RelativePath=".\cheatsWin.h"
 					>
@@ -1024,6 +726,10 @@
 					RelativePath=".\ginfo.h"
 					>
 				</File>
+				<File
+					RelativePath=".\hotkey.h"
+					>
+				</File>
 				<File
 					RelativePath=".\inputdx.h"
 					>
@@ -1036,6 +742,10 @@
 					RelativePath=".\lightView.h"
 					>
 				</File>
+				<File
+					RelativePath=".\main.h"
+					>
+				</File>
 				<File
 					RelativePath=".\mapView.h"
 					>
@@ -1056,6 +766,18 @@
 					RelativePath=".\palView.h"
 					>
 				</File>
+				<File
+					RelativePath=".\ram_search.h"
+					>
+				</File>
+				<File
+					RelativePath=".\ramwatch.h"
+					>
+				</File>
+				<File
+					RelativePath=".\replay.h"
+					>
+				</File>
 				<File
 					RelativePath=".\resource.h"
 					>
@@ -1072,6 +794,14 @@
 					RelativePath=".\tileView.h"
 					>
 				</File>
+				<Filter
+					Name="userconfig"
+					>
+					<File
+						RelativePath=".\userconfig\userconfig.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="core"
@@ -1184,6 +914,10 @@
 					RelativePath="..\MMU.h"
 					>
 				</File>
+				<File
+					RelativePath="..\movie.h"
+					>
+				</File>
 				<File
 					RelativePath="..\NDSSystem.h"
 					>
@@ -1220,6 +954,10 @@
 					RelativePath="..\saves.h"
 					>
 				</File>
+				<File
+					RelativePath="..\shaders.h"
+					>
+				</File>
 				<File
 					RelativePath="..\softrender.h"
 					>
@@ -1255,6 +993,10 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
+			<File
+				RelativePath=".\bitmap1.bmp"
+				>
+			</File>
 			<File
 				RelativePath=".\DeSmuME.ico"
 				>
@@ -1266,5 +1008,9 @@
 		</Filter>
 	</Files>
 	<Globals>
+		<Global
+			Name="RESOURCE_FILE"
+			Value="resources.rc"
+		/>
 	</Globals>
 </VisualStudioProject>