diff --git a/desmume/src/windows/ConfigKeys.c b/desmume/src/windows/ConfigKeys.c
index 81b8fe0a2..7b549bf5f 100644
--- a/desmume/src/windows/ConfigKeys.c
+++ b/desmume/src/windows/ConfigKeys.c
@@ -95,46 +95,46 @@ void  ReadConfig(void)
 
     GetINIPath(IniName,MAX_PATH);
 
-    i=GetPrivateProfileInt("KEYS","KEY_A",31, IniName);
+    i=GetPrivateProfileInt("Keys","Key_A",31, IniName);
     KEY_A = i;
     
-    i=GetPrivateProfileInt("KEYS","KEY_B",11, IniName);
+    i=GetPrivateProfileInt("Keys","Key_B",11, IniName);
     KEY_B = i;
     
-    i=GetPrivateProfileInt("KEYS","KEY_SELECT",36, IniName);
+    i=GetPrivateProfileInt("Keys","Key_SELECT",36, IniName);
     KEY_SELECT = i;
     
-    i=GetPrivateProfileInt("KEYS","KEY_START",13, IniName);
+    i=GetPrivateProfileInt("Keys","Key_START",13, IniName);
     if(i==13)
     KEY_START = 47;
     else
     KEY_START = i;
         
-    i=GetPrivateProfileInt("KEYS","KEY_RIGHT",40, IniName);
+    i=GetPrivateProfileInt("Keys","Key_RIGHT",40, IniName);
     KEY_RIGHT = i;
     
-    i=GetPrivateProfileInt("KEYS","KEY_LEFT",39, IniName);
+    i=GetPrivateProfileInt("Keys","Key_LEFT",39, IniName);
     KEY_LEFT = i;
     
-    i=GetPrivateProfileInt("KEYS","KEY_UP",37, IniName);
+    i=GetPrivateProfileInt("Keys","Key_UP",37, IniName);
     KEY_UP = i;
     
-    i=GetPrivateProfileInt("KEYS","KEY_DOWN",38, IniName);
+    i=GetPrivateProfileInt("Keys","Key_DOWN",38, IniName);
     KEY_DOWN = i;  
     
-    i=GetPrivateProfileInt("KEYS","KEY_R",23, IniName);
+    i=GetPrivateProfileInt("Keys","Key_R",23, IniName);
     KEY_R = i;
     
-    i=GetPrivateProfileInt("KEYS","KEY_L",12, IniName);
+    i=GetPrivateProfileInt("Keys","Key_L",12, IniName);
     KEY_L = i;
     
-    i=GetPrivateProfileInt("KEYS","KEY_X",16, IniName);
+    i=GetPrivateProfileInt("Keys","Key_X",16, IniName);
     KEY_X = i;
     
-    i=GetPrivateProfileInt("KEYS","KEY_Y",17, IniName);
+    i=GetPrivateProfileInt("Keys","Key_Y",17, IniName);
     KEY_Y = i;
 
-    /*i=GetPrivateProfileInt("KEYS","KEY_DEBUG",13, IniName);
+    /*i=GetPrivateProfileInt("Keys","Key_DEBUG",13, IniName);
     KEY_DEBUG = i;*/
 }
 
@@ -152,24 +152,24 @@ void  WriteConfig(void)
     
     GetINIPath(IniName,MAX_PATH);
 
-    WritePrivateProfileInt("KEYS","KEY_A",KEY_A,IniName);
-    WritePrivateProfileInt("KEYS","KEY_B",KEY_B,IniName);
-    WritePrivateProfileInt("KEYS","KEY_SELECT",KEY_SELECT,IniName);
+    WritePrivateProfileInt("Keys","Key_A",KEY_A,IniName);
+    WritePrivateProfileInt("Keys","Key_B",KEY_B,IniName);
+    WritePrivateProfileInt("Keys","Key_SELECT",KEY_SELECT,IniName);
     
     if(KEY_START==47)
-    WritePrivateProfileInt("KEYS","KEY_START",13,IniName);
+    WritePrivateProfileInt("Keys","Key_START",13,IniName);
     else
-    WritePrivateProfileInt("KEYS","KEY_START",KEY_START,IniName);
+    WritePrivateProfileInt("Keys","Key_START",KEY_START,IniName);
     
-    WritePrivateProfileInt("KEYS","KEY_RIGHT",KEY_RIGHT,IniName);
-    WritePrivateProfileInt("KEYS","KEY_LEFT",KEY_LEFT,IniName);
-    WritePrivateProfileInt("KEYS","KEY_UP",KEY_UP,IniName);
-    WritePrivateProfileInt("KEYS","KEY_DOWN",KEY_DOWN,IniName);
-    WritePrivateProfileInt("KEYS","KEY_R",KEY_R,IniName);
-    WritePrivateProfileInt("KEYS","KEY_L",KEY_L,IniName);
-    WritePrivateProfileInt("KEYS","KEY_X",KEY_X,IniName);
-    WritePrivateProfileInt("KEYS","KEY_Y",KEY_Y,IniName);
-    /*WritePrivateProfileInt("KEYS","KEY_DEBUG",KEY_DEBUG,IniName);*/
+    WritePrivateProfileInt("Keys","Key_RIGHT",KEY_RIGHT,IniName);
+    WritePrivateProfileInt("Keys","Key_LEFT",KEY_LEFT,IniName);
+    WritePrivateProfileInt("Keys","Key_UP",KEY_UP,IniName);
+    WritePrivateProfileInt("Keys","Key_DOWN",KEY_DOWN,IniName);
+    WritePrivateProfileInt("Keys","Key_R",KEY_R,IniName);
+    WritePrivateProfileInt("Keys","Key_L",KEY_L,IniName);
+    WritePrivateProfileInt("Keys","Key_X",KEY_X,IniName);
+    WritePrivateProfileInt("Keys","Key_Y",KEY_Y,IniName);
+    /*WritePrivateProfileInt("Keys","Key_DEBUG",KEY_DEBUG,IniName);*/
 }
 
 void dsDefaultKeys(void)
diff --git a/desmume/src/windows/DeSmuME.dev b/desmume/src/windows/DeSmuME.dev
index 28d34fdaf..864565200 100644
--- a/desmume/src/windows/DeSmuME.dev
+++ b/desmume/src/windows/DeSmuME.dev
@@ -1,7 +1,7 @@
 [Project]
 FileName=DeSmuME.dev
 Name=DeSmuME
-UnitCount=72
+UnitCount=77
 Type=0
 Ver=1
 ObjFiles=
@@ -10,10 +10,10 @@ Libs=
 PrivateResource=yopyop_private.rc
 ResourceIncludes=
 MakeIncludes=
-Compiler=-DVERSION=\"0.5\" _@@_
+Compiler=-DVERSION=\"0.7\" _@@_
 CppCompiler=_@@_
-Linker=-ldxguid -ldxerr8 -ldsound -lws2_32_@@_
-IsCpp=1
+Linker=-ldxguid_@@_-ldxerr8_@@_-ldsound_@@_-lws2_32_@@_-lglu32_@@_-lopengl32_@@_
+IsCpp=0
 Icon=DeSmuME.ico
 ExeOutput=
 ObjectOutput=obj
@@ -27,7 +27,7 @@ CustomMakefile=
 IncludeVersionInfo=1
 SupportXPThemes=1
 CompilerSet=0
-CompilerSettings=00000000010010010000ib
+CompilerSettings=0000000001001001000100
 
 [Unit1]
 FileName=..\ROMReader.c
@@ -42,8 +42,8 @@ BuildCmd=$(CC) -c ROMReader.c -o obj/ROMReader.o $(CFLAGS)
 [VersionInfo]
 Major=0
 Minor=0
-Release=3
-Build=4
+Release=7
+Build=0
 LanguageID=5129
 CharsetID=1252
 CompanyName=yopyop
@@ -59,7 +59,7 @@ AutoIncBuildNr=0
 
 [Unit3]
 FileName=yopyop_private.rc
-CompileCpp=1
+CompileCpp=0
 Folder=Resources
 Compile=1
 Link=0
@@ -69,7 +69,7 @@ BuildCmd=
 
 [Unit4]
 FileName=..\types.h
-CompileCpp=1
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -79,7 +79,7 @@ BuildCmd=
 
 [Unit8]
 FileName=..\cp15.h
-CompileCpp=1
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -109,7 +109,7 @@ BuildCmd=$(CC) -c FIFO.c -o obj/FIFO.o $(CFLAGS)
 
 [Unit15]
 FileName=..\Disassembler.h
-CompileCpp=1
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -125,7 +125,7 @@ Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
-CompileCpp=1
+CompileCpp=0
 
 [Unit17]
 FileName=..\fs-windows.c
@@ -139,7 +139,7 @@ BuildCmd=$(CC) -c fs-windows.c -o obj/fs-windows.o $(CFLAGS)
 
 [Unit18]
 FileName=..\fs.h
-CompileCpp=1
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -159,7 +159,7 @@ CompileCpp=0
 
 [Unit20]
 FileName=..\GPU.h
-CompileCpp=1
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -168,18 +168,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit21]
-FileName=..\ARM9.c
-CompileCpp=0
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c ARM9.c -o obj/ARM9.o $(CFLAGS)
-
-[Unit22]
 FileName=..\ARM9.h
-CompileCpp=1
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -187,7 +177,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit23]
+[Unit22]
 FileName=ConfigKeys.c
 CompileCpp=0
 Folder=DeSmuME
@@ -197,7 +187,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c ConfigKeys.c -o obj/ConfigKeys.o $(CFLAGS)
 
-[Unit24]
+[Unit23]
 FileName=CWindow.c
 CompileCpp=0
 Folder=DeSmuME
@@ -207,7 +197,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c CWindow.c -o obj/CWindow.o $(CFLAGS)
 
-[Unit25]
+[Unit24]
 FileName=disView.c
 CompileCpp=0
 Folder=DeSmuME
@@ -217,7 +207,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c disView.c -o obj/disView.o $(CFLAGS)
 
-[Unit26]
+[Unit25]
 FileName=ginfo.c
 CompileCpp=0
 Folder=DeSmuME
@@ -227,7 +217,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c ginfo.c -o obj/ginfo.o $(CFLAGS)
 
-[Unit27]
+[Unit26]
 FileName=IORegView.c
 CompileCpp=0
 Folder=DeSmuME
@@ -237,7 +227,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c IORegView.c -o obj/IORegView.o $(CFLAGS)
 
-[Unit28]
+[Unit27]
 FileName=main.c
 CompileCpp=0
 Folder=DeSmuME
@@ -247,7 +237,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c main.c -o obj/main.o $(CFLAGS)
 
-[Unit29]
+[Unit28]
 FileName=mapView.c
 CompileCpp=0
 Folder=DeSmuME
@@ -257,17 +247,17 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c mapView.c -o obj/mapView.o $(CFLAGS)
 
-[Unit32]
-FileName=palView.c
+[Unit29]
+FileName=memView.c
 CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
-BuildCmd=$(CC) -c palView.c -o obj/palView.o $(CFLAGS)
+BuildCmd=$(CC) -c memView.c -o obj/memView.o $(CFLAGS)
 
-[Unit33]
+[Unit32]
 FileName=tileView.c
 CompileCpp=0
 Folder=DeSmuME
@@ -277,9 +267,19 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c tileView.c -o obj/tileView.o $(CFLAGS)
 
-[Unit34]
+[Unit33]
 FileName=ConfigKeys.h
-CompileCpp=1
+CompileCpp=0
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit34]
+FileName=CWindow.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -288,8 +288,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit37]
-FileName=ginfo.h
-CompileCpp=1
+FileName=IORegView.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -298,8 +298,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit41]
-FileName=oamView.h
-CompileCpp=1
+FileName=palView.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -308,8 +308,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit42]
-FileName=palView.h
-CompileCpp=1
+FileName=..\bios.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -318,8 +318,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit43]
-FileName=..\bios.h
-CompileCpp=1
+FileName=..\bits.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -328,8 +328,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit46]
-FileName=..\dscard.h
-CompileCpp=1
+FileName=..\fat.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -338,8 +338,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit35]
-FileName=CWindow.h
-CompileCpp=1
+FileName=disView.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -348,8 +348,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit40]
-FileName=memView.h
-CompileCpp=1
+FileName=oamView.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -358,8 +358,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit44]
-FileName=..\bits.h
-CompileCpp=1
+FileName=..\cflash.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -368,8 +368,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit45]
-FileName=..\cflash.h
-CompileCpp=1
+FileName=..\dscard.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -378,8 +378,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit47]
-FileName=..\fat.h
-CompileCpp=1
+FileName=..\mc.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -388,8 +388,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit48]
-FileName=..\mc.h
-CompileCpp=1
+FileName=..\mem.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -398,8 +398,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit49]
-FileName=..\mem.h
-CompileCpp=1
+FileName=..\MMU.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -408,8 +408,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit50]
-FileName=..\MMU.h
-CompileCpp=1
+FileName=..\NDSSystem.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -418,18 +418,18 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit31]
-FileName=oamView.c
+FileName=palView.c
 CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
-BuildCmd=$(CC) -c oamView.c -o obj/oamView.o $(CFLAGS)
+BuildCmd=$(CC) -c palView.c -o obj/palView.o $(CFLAGS)
 
 [Unit36]
-FileName=disView.h
-CompileCpp=1
+FileName=ginfo.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -438,8 +438,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit38]
-FileName=IORegView.h
-CompileCpp=1
+FileName=mapView.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -448,8 +448,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit39]
-FileName=mapView.h
-CompileCpp=1
+FileName=memView.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -458,16 +458,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit53]
-FileName=..\SPU.h
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit54]
 FileName=..\arm_instructions.c
 CompileCpp=0
 Folder=DeSmuME
@@ -477,7 +467,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c arm_instructions.c -o obj/arm_instructions.o $(CFLAGS)
 
-[Unit55]
+[Unit54]
 FileName=..\armcpu.c
 CompileCpp=0
 Folder=DeSmuME
@@ -487,7 +477,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c armcpu.c -o obj/armcpu.o $(CFLAGS)
 
-[Unit56]
+[Unit55]
 FileName=..\bios.c
 CompileCpp=0
 Folder=DeSmuME
@@ -497,7 +487,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c bios.c -o obj/bios.o $(CFLAGS)
 
-[Unit57]
+[Unit56]
 FileName=..\cflash.c
 CompileCpp=0
 Folder=DeSmuME
@@ -507,7 +497,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c cflash.c -o obj/cflash.o $(CFLAGS)
 
-[Unit58]
+[Unit57]
 FileName=..\cp15.c
 CompileCpp=0
 Folder=DeSmuME
@@ -517,17 +507,17 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c cp15.c -o obj/cp15.o $(CFLAGS)
 
-[Unit60]
-FileName=..\MMU.c
+[Unit58]
+FileName=..\mc.c
 CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
-BuildCmd=$(CC) -c MMU.c -o obj/MMU.o $(CFLAGS)
+BuildCmd=$(CC) -c mc.c -o obj/mc.o $(CFLAGS)
 
-[Unit61]
+[Unit60]
 FileName=..\NDSSystem.c
 CompileCpp=0
 Folder=DeSmuME
@@ -537,7 +527,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c NDSSystem.c -o obj/NDSSystem.o $(CFLAGS)
 
-[Unit62]
+[Unit61]
 FileName=..\saves.c
 CompileCpp=0
 Folder=DeSmuME
@@ -547,9 +537,19 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c saves.c -o obj/saves.o $(CFLAGS)
 
+[Unit62]
+FileName=..\SPU.c
+CompileCpp=0
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c SPU.c -o obj/SPU.o $(CFLAGS)
+
 [Unit5]
 FileName=..\arm_instructions.h
-CompileCpp=1
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -559,7 +559,7 @@ BuildCmd=
 
 [Unit6]
 FileName=..\armcpu.h
-CompileCpp=1
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -569,7 +569,7 @@ BuildCmd=
 
 [Unit7]
 FileName=..\config.h
-CompileCpp=1
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -579,7 +579,7 @@ BuildCmd=
 
 [Unit11]
 FileName=..\thumb_instructions.h
-CompileCpp=1
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -589,7 +589,7 @@ BuildCmd=
 
 [Unit12]
 FileName=resource.h
-CompileCpp=1
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -608,14 +608,14 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c Disassembler.c -o obj/Disassembler.o $(CFLAGS)
 
 [Unit30]
-FileName=memView.c
+FileName=oamView.c
 CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
-BuildCmd=$(CC) -c memView.c -o obj/memView.o $(CFLAGS)
+BuildCmd=$(CC) -c oamView.c -o obj/oamView.o $(CFLAGS)
 
 [Unit9]
 FileName=..\debug.c
@@ -637,8 +637,8 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit51]
-FileName=..\NDSSystem.h
-CompileCpp=1
+FileName=..\saves.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -647,16 +647,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit64]
-FileName=..\thumb_instructions.c
-CompileCpp=0
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c thumb_instructions.c -o obj/thumb_instructions.o $(CFLAGS)
-
-[Unit65]
 FileName=snddx.c
 CompileCpp=0
 Folder=DeSmuME
@@ -666,9 +656,19 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=$(CC) -c snddx.c -o obj/snddx.o $(CFLAGS)
 
-[Unit66]
+[Unit65]
 FileName=snddx.h
-CompileCpp=1
+CompileCpp=0
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit66]
+FileName=..\registers.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -677,18 +677,18 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit59]
-FileName=..\mc.c
+FileName=..\MMU.c
 CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
-BuildCmd=$(CC) -c mc.c -o obj/mc.o $(CFLAGS)
+BuildCmd=$(CC) -c MMU.c -o obj/MMU.o $(CFLAGS)
 
 [Unit52]
-FileName=..\saves.h
-CompileCpp=1
+FileName=..\SPU.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -697,18 +697,18 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit63]
-FileName=..\SPU.c
+FileName=..\thumb_instructions.c
 CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
-BuildCmd=$(CC) -c SPU.c -o obj/SPU.o $(CFLAGS)
+BuildCmd=$(CC) -c thumb_instructions.c -o obj/thumb_instructions.o $(CFLAGS)
 
 [Unit67]
-FileName=..\registers.h
-CompileCpp=1
+FileName=..\ROMReader.h
+CompileCpp=0
 Folder=DeSmuME
 Compile=1
 Link=1
@@ -717,9 +717,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit68]
-FileName=..\ROMReader.h
-CompileCpp=1
-Folder=DeSmuME
+FileName=..\wifi.h
+CompileCpp=0
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -727,27 +727,16 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit69]
-FileName=..\wifi.h
-CompileCpp=1
+FileName=..\wifi.c
+CompileCpp=0
 Folder=
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
-BuildCmd=
+BuildCmd=$(CC) -c wifi.c -o obj/wifi.o $(CFLAGS)
 
 [Unit70]
-FileName=..\wifi.c
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-
-[Unit71]
 FileName=..\gl_vertex.c
 CompileCpp=0
 Folder=
@@ -757,7 +746,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit72]
+[Unit71]
 FileName=..\gl_vertex.h
 CompileCpp=0
 Folder=
@@ -766,3 +755,64 @@ Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
+
+[Unit72]
+FileName=OGLRender.h
+CompileCpp=0
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit73]
+FileName=OGLRender.c
+CompileCpp=0
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c OGLRender.c -o obj/OGLRender.o $(CFLAGS)
+
+[Unit74]
+FileName=..\matrix.c
+CompileCpp=0
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c matrix.c -o obj/matrix.o $(CFLAGS)
+
+[Unit75]
+FileName=..\render3D.c
+CompileCpp=0
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c render3D.c -o obj/render3D.o $(CFLAGS)
+
+[Unit76]
+FileName=..\matrix.h
+CompileCpp=0
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit77]
+FileName=..\render3D.h
+CompileCpp=0
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/desmume/src/windows/OGLRender.c b/desmume/src/windows/OGLRender.c
index 938c0a87b..d45bec2e6 100644
--- a/desmume/src/windows/OGLRender.c
+++ b/desmume/src/windows/OGLRender.c
@@ -1890,4 +1890,5 @@ GPU3DInterface gpu3Dgl = {	NDS_glInit,
 							  
 							NDS_glGetClipMatrix,
 							NDS_glGetDirectionalMatrix,
-							NDS_glGetLine};
\ No newline at end of file
+							NDS_glGetLine};
+							
diff --git a/desmume/src/windows/main.c b/desmume/src/windows/main.c
index d94dc0e27..a84cb47f7 100644
--- a/desmume/src/windows/main.c
+++ b/desmume/src/windows/main.c
@@ -48,13 +48,10 @@
 #include "mapview.h"
 #include "ConfigKeys.h"
 #include "OGLRender.h"
+#include "../render3D.h"
 
 #include "snddx.h"
 
-#ifdef RENDER3D
-     #include "OGLRender.h"
-#endif
-
 /*  Declare Windows procedure  */
 LRESULT CALLBACK WindowProcedure (HWND, UINT, WPARAM, LPARAM);
 
@@ -284,7 +281,8 @@ DWORD WINAPI run( LPVOID lpParameter)
      rotationbmi.bV4Width = 256;
      rotationbmi.bV4Height = -192;
 
-     NDS_3D_SetDriver (GPU3D_OPENGL);
+     //NDS_3D_SetDriver (GPU3D_OPENGL);
+     NDS_3D_SetDriver (GPU3D_NULL);
 
 	if (!gpu3D->NDS_3D_Init ())
 	{
@@ -509,6 +507,16 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
 	sndvolume = GetPrivateProfileInt("Sound","Volume",100, IniName);
     SPU_SetVolume(sndvolume);
     
+    memset(&firmware,0,sizeof(firmware));
+    firmware.favColor = GetPrivateProfileInt("Firmware","favColor", 10, IniName);
+    firmware.bMonth = GetPrivateProfileInt("Firmware","bMonth", 7, IniName);
+    firmware.bDay = GetPrivateProfileInt("Firmware","bDay", 15, IniName);
+    GetPrivateProfileString("Firmware","nickName", "yopyop", firmware.nickName, 10, IniName);
+    firmware.nickLen = strlen(firmware.nickName);
+    GetPrivateProfileString("Firmware","Message", "Hi,it/s me!", firmware.message, 26, IniName);
+    firmware.msgLen = strlen(firmware.message);
+    firmware.language = GetPrivateProfileInt("Firmware","Language", 2, IniName);
+    
     runthread = CreateThread(NULL, 0, run, NULL, 0, &threadID);
 
     // Make sure any quotes from lpszArgument are removed
diff --git a/desmume/src/windows/yopyop_private.h b/desmume/src/windows/yopyop_private.h
index 190988a5a..18278bb4f 100644
--- a/desmume/src/windows/yopyop_private.h
+++ b/desmume/src/windows/yopyop_private.h
@@ -5,11 +5,11 @@
 #define YOPYOP_PRIVATE_H
 
 /* VERSION DEFINITIONS */
-#define VER_STRING	"0.0.0.1"
+#define VER_STRING	"0.0.7.0"
 #define VER_MAJOR	0
 #define VER_MINOR	0
-#define VER_RELEASE	0
-#define VER_BUILD	1
+#define VER_RELEASE	7
+#define VER_BUILD	0
 #define COMPANY_NAME	"yopyop"
 #define FILE_VERSION	""
 #define FILE_DESCRIPTION	"NDS(tm) emulator"