diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj
index c327f3a00..d75ee14ed 100644
--- a/desmume/src/windows/DeSmuME_2005.vcproj
+++ b/desmume/src/windows/DeSmuME_2005.vcproj
@@ -23,7 +23,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\_$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			>
@@ -84,6 +84,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x86.manifest"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
@@ -107,7 +108,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\_$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			>
@@ -170,6 +171,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x64.manifest"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
@@ -193,7 +195,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\_$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			>
@@ -253,6 +255,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x86.manifest"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
@@ -276,7 +279,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\_$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			>
@@ -338,6 +341,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x64.manifest"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
@@ -361,7 +365,7 @@
 		<Configuration
 			Name="Release (SSE2)|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\_$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			>
@@ -421,6 +425,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x86.manifest"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
@@ -444,7 +449,7 @@
 		<Configuration
 			Name="Release (SSE2)|x64"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\_$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			>
@@ -506,6 +511,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x64.manifest"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/desmume/src/windows/DeSmuME_2008.vcproj
index ffbd969f1..9a4a8fa7f 100644
--- a/desmume/src/windows/DeSmuME_2008.vcproj
+++ b/desmume/src/windows/DeSmuME_2008.vcproj
@@ -24,7 +24,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\_$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			>
@@ -87,6 +87,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x86.manifest"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
@@ -107,7 +108,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\_$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			>
@@ -172,6 +173,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x64.manifest"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
@@ -192,7 +194,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\_$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			>
@@ -255,6 +257,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x86.manifest"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
@@ -275,7 +278,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\_$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			>
@@ -340,6 +343,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x64.manifest"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
@@ -360,7 +364,7 @@
 		<Configuration
 			Name="Release (SSE2)|Win32"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\_$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			>
@@ -423,6 +427,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x86.manifest"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
@@ -443,7 +448,7 @@
 		<Configuration
 			Name="Release (SSE2)|x64"
 			OutputDirectory="$(SolutionDir)\__bins"
-			IntermediateDirectory="$(SolutionDir)\_$(ConfigurationName)\$(PlatformName)"
+			IntermediateDirectory="$(SolutionDir)\.VS2008\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			>
@@ -508,6 +513,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="DeSmuME_x64.manifest"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
diff --git a/desmume/src/windows/DeSmuME_x64.manifest b/desmume/src/windows/DeSmuME_x64.manifest
new file mode 100644
index 000000000..82412c9dd
--- /dev/null
+++ b/desmume/src/windows/DeSmuME_x64.manifest
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="DevCpp.Apps.DeSmuME"
+    processorArchitecture="amd64"
+    version="1.0.0.0"
+    type="win32"/>
+<description>DeSmuME</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="amd64"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/desmume/src/windows/DeSmuME_x86.manifest b/desmume/src/windows/DeSmuME_x86.manifest
new file mode 100644
index 000000000..f838b26db
--- /dev/null
+++ b/desmume/src/windows/DeSmuME_x86.manifest
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="DevCpp.Apps.DeSmuME"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>DeSmuME</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index 8686bc015..e95b2aee9 100644
--- a/desmume/src/windows/resources.rc
+++ b/desmume/src/windows/resources.rc
@@ -1,5 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
+#include "resrc1.h"
+
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -19,7 +21,7 @@
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
 #ifdef _WIN32
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
+#pragma code_page(1251)
 #endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
@@ -29,17 +31,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDR_MAIN_ACCEL ACCELERATORS 
 BEGIN
-    VK_F1,          IDM_STATE_SAVE_F1,      VIRTKEY, SHIFT, NOINVERT
-    VK_F2,          IDM_STATE_SAVE_F2,      VIRTKEY, SHIFT, NOINVERT
-    VK_F3,          IDM_STATE_SAVE_F3,      VIRTKEY, SHIFT, NOINVERT
-    VK_F4,          IDM_STATE_SAVE_F4,      VIRTKEY, SHIFT, NOINVERT
-    VK_F5,          IDM_STATE_SAVE_F5,      VIRTKEY, SHIFT, NOINVERT
-    VK_F6,          IDM_STATE_SAVE_F6,      VIRTKEY, SHIFT, NOINVERT
-    VK_F7,          IDM_STATE_SAVE_F7,      VIRTKEY, SHIFT, NOINVERT
-    VK_F8,          IDM_STATE_SAVE_F8,      VIRTKEY, SHIFT, NOINVERT
-    VK_F9,          IDM_STATE_SAVE_F9,      VIRTKEY, SHIFT, NOINVERT
-    VK_F10,         IDM_STATE_SAVE_F10,     VIRTKEY, SHIFT, NOINVERT
     VK_F1,          IDM_STATE_LOAD_F1,      VIRTKEY, NOINVERT
+    VK_F10,         IDM_STATE_LOAD_F10,     VIRTKEY, NOINVERT
     VK_F2,          IDM_STATE_LOAD_F2,      VIRTKEY, NOINVERT
     VK_F3,          IDM_STATE_LOAD_F3,      VIRTKEY, NOINVERT
     VK_F4,          IDM_STATE_LOAD_F4,      VIRTKEY, NOINVERT
@@ -48,7 +41,16 @@ BEGIN
     VK_F7,          IDM_STATE_LOAD_F7,      VIRTKEY, NOINVERT
     VK_F8,          IDM_STATE_LOAD_F8,      VIRTKEY, NOINVERT
     VK_F9,          IDM_STATE_LOAD_F9,      VIRTKEY, NOINVERT
-    VK_F10,         IDM_STATE_LOAD_F10,     VIRTKEY, NOINVERT
+    VK_F1,          IDM_STATE_SAVE_F1,      VIRTKEY, SHIFT, NOINVERT
+    VK_F10,         IDM_STATE_SAVE_F10,     VIRTKEY, SHIFT, NOINVERT
+    VK_F2,          IDM_STATE_SAVE_F2,      VIRTKEY, SHIFT, NOINVERT
+    VK_F3,          IDM_STATE_SAVE_F3,      VIRTKEY, SHIFT, NOINVERT
+    VK_F4,          IDM_STATE_SAVE_F4,      VIRTKEY, SHIFT, NOINVERT
+    VK_F5,          IDM_STATE_SAVE_F5,      VIRTKEY, SHIFT, NOINVERT
+    VK_F6,          IDM_STATE_SAVE_F6,      VIRTKEY, SHIFT, NOINVERT
+    VK_F7,          IDM_STATE_SAVE_F7,      VIRTKEY, SHIFT, NOINVERT
+    VK_F8,          IDM_STATE_SAVE_F8,      VIRTKEY, SHIFT, NOINVERT
+    VK_F9,          IDM_STATE_SAVE_F9,      VIRTKEY, SHIFT, NOINVERT
 END
 
 #endif    // Neutral resources
@@ -56,7 +58,7 @@ END
 
 
 /////////////////////////////////////////////////////////////////////////////
-// Danés resources
+// Danish resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DAN)
 #ifdef _WIN32
@@ -215,42 +217,30 @@ FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDC_FERMER,67,208,50,14
     PUSHBUTTON      "Standard",IDC_BUTTON1,7,208,50,14
-    COMBOBOX        IDC_COMBO1,46,13,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO1,46,13,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Op:",IDC_STATIC,17,14,27,10
-    COMBOBOX        IDC_COMBO4,46,29,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO4,46,29,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Ned:",IDC_STATIC,17,31,28,9
-    COMBOBOX        IDC_COMBO2,46,45,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO2,46,45,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Venstre:",IDC_STATIC,17,47,28,9
-    COMBOBOX        IDC_COMBO3,46,61,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO3,46,61,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Højre:",IDC_STATIC,17,63,28,9
-    COMBOBOX        IDC_COMBO7,46,77,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO7,46,77,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "A:",IDC_STATIC,18,78,28,9
-    COMBOBOX        IDC_COMBO8,46,92,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO8,46,92,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "B:",IDC_STATIC,17,94,28,9
-    COMBOBOX        IDC_COMBO10,46,108,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO10,46,108,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "L:",IDC_STATIC,17,110,28,9
-    COMBOBOX        IDC_COMBO11,46,124,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO11,46,124,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "R:",IDC_STATIC,17,126,28,9
-    COMBOBOX        IDC_COMBO6,46,140,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO6,46,140,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "X:",IDC_STATIC,17,142,28,9
-    COMBOBOX        IDC_COMBO5,46,156,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO5,46,156,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Y:",IDC_STATIC,17,158,28,9
     GROUPBOX        "",IDC_STATIC,7,3,111,203
-    COMBOBOX        IDC_COMBO9,46,172,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO9,46,172,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Start:",IDC_STATIC,17,174,28,9
-    COMBOBOX        IDC_COMBO12,46,188,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO12,46,188,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Select:",IDC_STATIC,17,190,28,9
 END
 
@@ -259,20 +249,14 @@ STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU
 CAPTION "Vis Hukommelse"
 FONT 8, "MS Sans Serif"
 BEGIN
-    CONTROL         "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,
-                    10,4,29,10
-    CONTROL         "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33,
-                    10
-    CONTROL         "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33,
-                    10
+    CONTROL         "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,29,10
+    CONTROL         "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33,10
+    CONTROL         "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33,10
     LTEXT           "Gå Til:",IDC_STATIC,130,4,33,10
-    EDITTEXT        IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | 
-                    ES_WANTRETURN | WS_GROUP
+    EDITTEXT        IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP
     PUSHBUTTON      "&Start",IDC_GO,240,1,20,14
-    CONTROL         "Auto-opdatere",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,350,1,75,14
-    CONTROL         "Rediger",IDC_MEM_BOX,"MemViewBox",WS_VSCROLL | 
-                    WS_TABSTOP,4,16,424,142,WS_EX_CLIENTEDGE
+    CONTROL         "Auto-opdatere",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,350,1,75,14
+    CONTROL         "Rediger",IDC_MEM_BOX,"MemViewBox",WS_VSCROLL | WS_TABSTOP,4,16,424,142,WS_EX_CLIENTEDGE
     PUSHBUTTON      "&Luk",IDC_FERMER,185,162,50,14
 END
 
@@ -281,21 +265,16 @@ STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU
 CAPTION "Disassembler"
 FONT 8, "MS Sans Serif"
 BEGIN
-    CONTROL         "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,10,4,35,10
+    CONTROL         "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,35,10
     CONTROL         "ARM",IDC_ARM,"Button",BS_AUTORADIOBUTTON,44,4,35,10
     CONTROL         "Thumb",IDC_THUMB,"Button",BS_AUTORADIOBUTTON,82,4,40,10
     LTEXT           "Gå til:",IDC_STATIC,130,4,33,10
-    EDITTEXT        IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | 
-                    ES_WANTRETURN | WS_GROUP
+    EDITTEXT        IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP
     PUSHBUTTON      "&Start",IDC_GO,240,1,20,14
-    CONTROL         "Auto-opdatere",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,300,1,75,14
-    CONTROL         "Rediger",IDC_DES_BOX,"DesViewBox",WS_VSCROLL | 
-                    WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE
+    CONTROL         "Auto-opdatere",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,300,1,75,14
+    CONTROL         "Rediger",IDC_DES_BOX,"DesViewBox",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE
     PUSHBUTTON      "&Luk",IDC_FERMER,185,170,50,14
-    EDITTEXT        IDC_SETPNUM,5,170,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | 
-                    ES_NUMBER | WS_GROUP
+    EDITTEXT        IDC_SETPNUM,5,170,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
     PUSHBUTTON      "&Step",IDC_STEP,75,170,50,14
     LTEXT           "R0 :",IDC_STATIC,304,16,17,8
     LTEXT           "R1 :",IDC_STATIC,304,24,17,8
@@ -384,8 +363,7 @@ STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU
 CAPTION "Logbog"
 FONT 8, "MS Sans Serif"
 BEGIN
-    CONTROL         "Rediger",IDC_LOG,"LogView",WS_VSCROLL | WS_TABSTOP,4,4,
-                    292,280,WS_EX_CLIENTEDGE
+    CONTROL         "Rediger",IDC_LOG,"LogView",WS_VSCROLL | WS_TABSTOP,4,4,292,280,WS_EX_CLIENTEDGE
     PUSHBUTTON      "&Luk",IDC_FERMER,125,285,50,14
 END
 
@@ -397,8 +375,7 @@ BEGIN
     COMBOBOX        IDC_PAL_SELECT,15,3,90,14,CBS_DROPDOWN | WS_TABSTOP
     LTEXT           "Pal : 0",IDC_PALNUM,3,21,25,8
     SCROLLBAR       IDC_SCROLLER,30,18,20,14
-    CONTROL         "Auto-opdatere",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,60,18,75,14
+    CONTROL         "Auto-opdatere",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,18,75,14
     PUSHBUTTON      "&Luk",IDC_FERMER,35,149,50,14
 END
 
@@ -411,18 +388,12 @@ BEGIN
     LTEXT           "Pal : 0",IDC_PALNUM,4,31,25,8
     SCROLLBAR       IDC_SCROLLER,30,28,20,14
     COMBOBOX        IDC_MEM_SELECT,4,50,90,14,CBS_DROPDOWN | WS_TABSTOP
-    CONTROL         "Bitmap",IDC_BITMAP,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,4,68,35,10
-    CONTROL         "256 Farver",IDC_256COUL,"Button",BS_AUTORADIOBUTTON,4,
-                    80,55,10
-    CONTROL         "16 Farver",IDC_16COUL,"Button",BS_AUTORADIOBUTTON,4,92,
-                    50,10
-    CONTROL         "Auto-opdatere",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,369,164,75,14
-    CONTROL         "Rediger",IDC_Tile_BOX,"TileViewBox",WS_TABSTOP,100,2,
-                    344,160,WS_EX_CLIENTEDGE
-    CONTROL         "Rediger",IDC_MINI_TILE,"MiniTileViewBox",WS_TABSTOP,22,
-                    116,56,52,WS_EX_CLIENTEDGE
+    CONTROL         "Bitmap",IDC_BITMAP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,4,68,35,10
+    CONTROL         "256 Farver",IDC_256COUL,"Button",BS_AUTORADIOBUTTON,4,80,55,10
+    CONTROL         "16 Farver",IDC_16COUL,"Button",BS_AUTORADIOBUTTON,4,92,50,10
+    CONTROL         "Auto-opdatere",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,369,164,75,14
+    CONTROL         "Rediger",IDC_Tile_BOX,"TileViewBox",WS_TABSTOP,100,2,344,160,WS_EX_CLIENTEDGE
+    CONTROL         "Rediger",IDC_MINI_TILE,"MiniTileViewBox",WS_TABSTOP,22,116,56,52,WS_EX_CLIENTEDGE
     LTEXT           "Tile Num : 0",IDC_TILENUM,23,170,100,8
     PUSHBUTTON      "&Luk",IDC_FERMER,198,164,50,14
 END
@@ -480,15 +451,13 @@ BEGIN
 END
 
 SOUNDSETTINGSDLG DIALOG  0, 0, 174, 96
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Lyd Indstillinger"
 FONT 8, "MS Sans Serif"
 BEGIN
     GROUPBOX        "Lyd Indstillinger",-1,3,2,168,28
     LTEXT           "Lyd Driver",-1,10,14,40,10
-    COMBOBOX        IDC_SOUNDCORECB,54,13,110,33,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_SOUNDCORECB,54,13,110,33,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Andre Indstillinger",-1,3,31,168,43
     LTEXT           "Buffer Størrelse",-1,10,42,60,10
     EDITTEXT        IDC_SOUNDBUFFERET,136,41,28,13
@@ -499,45 +468,32 @@ BEGIN
 END
 
 IDD_FIRMSETTINGS DIALOG  0, 0, 161, 145
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Firmware Indstillinger"
 FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "&OK",IDOK,7,124,50,14
     PUSHBUTTON      "&Fortryd",IDCANCEL,104,124,50,14
-    CONTROL         "Favorit Farve:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,9,55,52,12
-    COMBOBOX        IDC_COMBO1,66,53,84,14,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Fødselsmåned:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,9,72,52,12
-    COMBOBOX        IDC_COMBO2,66,71,84,14,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Fødselsdag:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,9,90,52,12
-    COMBOBOX        IDC_COMBO3,66,88,84,14,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Sprog:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,9,106,52,12
-    COMBOBOX        IDC_COMBO4,66,105,84,14,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Kælenavn:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,9,17,52,12
-    EDITTEXT        IDC_EDIT1,66,14,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | 
-                    WS_GROUP
-    CONTROL         "Besked:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,9,36,52,12
-    EDITTEXT        IDC_EDIT2,66,33,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | 
-                    WS_GROUP
+    CONTROL         "Favorit Farve:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,55,52,12
+    COMBOBOX        IDC_COMBO1,66,53,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Fødselsmåned:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,72,52,12
+    COMBOBOX        IDC_COMBO2,66,71,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Fødselsdag:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,90,52,12
+    COMBOBOX        IDC_COMBO3,66,88,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Sprog:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,106,52,12
+    COMBOBOX        IDC_COMBO4,66,105,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Kælenavn:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,17,52,12
+    EDITTEXT        IDC_EDIT1,66,14,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP
+    CONTROL         "Besked:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,36,52,12
+    EDITTEXT        IDC_EDIT2,66,33,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP
 END
 
-#endif    // Danés resources
+#endif    // Danish resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// Alemán (Alemania) resources
+// German (Germany) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
 #ifdef _WIN32
@@ -557,31 +513,23 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,140,68,50,14
     GROUPBOX        "Light0",IDC_LIGHT_VIWER_LIGHT0_GROUP,7,7,90,27
-    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT0VECTOR_EDIT,58,16,35,14,
-                    ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
-    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT0COLOR_EDIT,33,16,23,14,
-                    ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
+    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT0VECTOR_EDIT,58,16,35,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
+    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT0COLOR_EDIT,33,16,23,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
     CONTROL         "",IDC_LIGHT_VIEWER_LIGHT0COLOR_COLORCTRL,
                     "DeSmuME_ColorCtrl",WS_TABSTOP,11,16,19,14
     GROUPBOX        "Light1",IDC_LIGHT_VIWER_LIGHT1_GROUP,100,7,90,27
-    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT1VECTOR_EDIT,151,16,35,14,
-                    ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
-    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT1COLOR_EDIT,126,16,23,14,
-                    ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
+    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT1VECTOR_EDIT,151,16,35,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
+    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT1COLOR_EDIT,126,16,23,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
     CONTROL         "",IDC_LIGHT_VIEWER_LIGHT1COLOR_COLORCTRL,
                     "DeSmuME_ColorCtrl",WS_TABSTOP,104,16,19,14
     GROUPBOX        "Light2",IDC_LIGHT_VIWER_LIGHT2_GROUP,7,33,90,27
-    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT2VECTOR_EDIT,58,43,35,14,
-                    ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
-    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT2COLOR_EDIT,33,43,23,14,
-                    ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
+    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT2VECTOR_EDIT,58,43,35,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
+    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT2COLOR_EDIT,33,43,23,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
     CONTROL         "",IDC_LIGHT_VIEWER_LIGHT2COLOR_COLORCTRL,
                     "DeSmuME_ColorCtrl",WS_TABSTOP,11,43,19,14
     GROUPBOX        "Light3",IDC_LIGHT_VIWER_LIGHT3_GROUP,100,33,90,27
-    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT3VECTOR_EDIT,151,43,35,14,
-                    ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
-    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT3COLOR_EDIT,126,43,23,14,
-                    ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
+    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT3VECTOR_EDIT,151,43,35,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
+    EDITTEXT        IDC_LIGHT_VIEWER_LIGHT3COLOR_EDIT,126,43,23,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP
     CONTROL         "",IDC_LIGHT_VIEWER_LIGHT3COLOR_COLORCTRL,
                     "DeSmuME_ColorCtrl",WS_TABSTOP,104,43,19,14
 END
@@ -643,12 +591,12 @@ BEGIN
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // Alemán (Alemania) resources
+#endif    // German (Germany) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// Inglés (Estados Unidos) resources
+// English (U.S.) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
@@ -810,42 +758,30 @@ FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDC_FERMER,67,208,50,14
     PUSHBUTTON      "Default",IDC_BUTTON1,7,208,50,14
-    COMBOBOX        IDC_COMBO1,46,13,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO1,46,13,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Up:",IDC_STATIC,17,14,27,10
-    COMBOBOX        IDC_COMBO4,46,29,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO4,46,29,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Down:",IDC_STATIC,17,31,28,9
-    COMBOBOX        IDC_COMBO2,46,45,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO2,46,45,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Left:",IDC_STATIC,17,47,28,9
-    COMBOBOX        IDC_COMBO3,46,61,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO3,46,61,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Right:",IDC_STATIC,17,63,28,9
-    COMBOBOX        IDC_COMBO7,46,77,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO7,46,77,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "A:",IDC_STATIC,18,78,28,9
-    COMBOBOX        IDC_COMBO8,46,92,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO8,46,92,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "B:",IDC_STATIC,17,94,28,9
-    COMBOBOX        IDC_COMBO10,46,108,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO10,46,108,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "L:",IDC_STATIC,17,110,28,9
-    COMBOBOX        IDC_COMBO11,46,124,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO11,46,124,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "R:",IDC_STATIC,17,126,28,9
-    COMBOBOX        IDC_COMBO6,46,140,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO6,46,140,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "X:",IDC_STATIC,17,142,28,9
-    COMBOBOX        IDC_COMBO5,46,156,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO5,46,156,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Y:",IDC_STATIC,17,158,28,9
     GROUPBOX        "",IDC_STATIC,7,3,111,203
-    COMBOBOX        IDC_COMBO9,46,172,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO9,46,172,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Start:",IDC_STATIC,17,174,28,9
-    COMBOBOX        IDC_COMBO12,46,188,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO12,46,188,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Select:",IDC_STATIC,17,190,28,9
 END
 
@@ -854,20 +790,14 @@ STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU
 CAPTION "View Memory"
 FONT 8, "MS Sans Serif"
 BEGIN
-    CONTROL         "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,
-                    10,4,29,10
-    CONTROL         "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33,
-                    10
-    CONTROL         "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33,
-                    10
+    CONTROL         "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,29,10
+    CONTROL         "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33,10
+    CONTROL         "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33,10
     LTEXT           "Go to:",IDC_STATIC,130,4,33,10
-    EDITTEXT        IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | 
-                    ES_WANTRETURN | WS_GROUP
+    EDITTEXT        IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP
     PUSHBUTTON      "&GO",IDC_GO,240,1,20,14
-    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,350,1,75,14
-    CONTROL         "Edit",IDC_MEM_BOX,"MemViewBox",WS_VSCROLL | WS_TABSTOP,
-                    4,16,424,142,WS_EX_CLIENTEDGE
+    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,350,1,75,14
+    CONTROL         "Edit",IDC_MEM_BOX,"MemViewBox",WS_VSCROLL | WS_TABSTOP,4,16,424,142,WS_EX_CLIENTEDGE
     PUSHBUTTON      "&Close",IDC_FERMER,185,162,50,14
 END
 
@@ -876,21 +806,16 @@ STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU
 CAPTION "Disassembler"
 FONT 8, "MS Sans Serif"
 BEGIN
-    CONTROL         "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,10,4,35,10
+    CONTROL         "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,35,10
     CONTROL         "ARM",IDC_ARM,"Button",BS_AUTORADIOBUTTON,44,4,35,10
     CONTROL         "Thumb",IDC_THUMB,"Button",BS_AUTORADIOBUTTON,82,4,40,10
     LTEXT           "Go to:",IDC_STATIC,130,4,33,10
-    EDITTEXT        IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | 
-                    ES_WANTRETURN | WS_GROUP
+    EDITTEXT        IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP
     PUSHBUTTON      "&GO",IDC_GO,240,1,20,14
-    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,300,1,75,14
-    CONTROL         "Edit",IDC_DES_BOX,"DesViewBox",WS_VSCROLL | WS_TABSTOP,
-                    4,16,296,150,WS_EX_CLIENTEDGE
+    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,300,1,75,14
+    CONTROL         "Edit",IDC_DES_BOX,"DesViewBox",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE
     PUSHBUTTON      "&Close",IDC_FERMER,185,170,50,14
-    EDITTEXT        IDC_SETPNUM,5,170,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | 
-                    ES_NUMBER | WS_GROUP
+    EDITTEXT        IDC_SETPNUM,5,170,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
     PUSHBUTTON      "&Step",IDC_STEP,75,170,50,14
     LTEXT           "R0   :",IDC_STATIC,304,16,17,8
     LTEXT           "R1   :",IDC_STATIC,304,24,17,8
@@ -979,8 +904,7 @@ STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU
 CAPTION "Log"
 FONT 8, "MS Sans Serif"
 BEGIN
-    CONTROL         "Edit",IDC_LOG,"LogView",WS_VSCROLL | WS_TABSTOP,4,4,292,
-                    280,WS_EX_CLIENTEDGE
+    CONTROL         "Edit",IDC_LOG,"LogView",WS_VSCROLL | WS_TABSTOP,4,4,292,280,WS_EX_CLIENTEDGE
     PUSHBUTTON      "&Close",IDC_FERMER,125,285,50,14
 END
 
@@ -992,8 +916,7 @@ BEGIN
     COMBOBOX        IDC_PAL_SELECT,15,3,90,14,CBS_DROPDOWN | WS_TABSTOP
     LTEXT           "Pal : 0",IDC_PALNUM,3,21,25,8
     SCROLLBAR       IDC_SCROLLER,30,18,20,14
-    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,60,18,75,14
+    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,18,75,14
     PUSHBUTTON      "&Close",IDC_FERMER,35,149,50,14
 END
 
@@ -1006,18 +929,12 @@ BEGIN
     LTEXT           "Pal : 0",IDC_PALNUM,4,31,25,8
     SCROLLBAR       IDC_SCROLLER,30,28,20,14
     COMBOBOX        IDC_MEM_SELECT,4,50,90,14,CBS_DROPDOWN | WS_TABSTOP
-    CONTROL         "Bitmap",IDC_BITMAP,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,4,68,35,10
-    CONTROL         "256 colors",IDC_256COUL,"Button",BS_AUTORADIOBUTTON,4,
-                    80,55,10
-    CONTROL         "16 colors",IDC_16COUL,"Button",BS_AUTORADIOBUTTON,4,92,
-                    50,10
-    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,369,164,75,14
-    CONTROL         "Edit",IDC_Tile_BOX,"TileViewBox",WS_TABSTOP,100,2,344,
-                    160,WS_EX_CLIENTEDGE
-    CONTROL         "Edit",IDC_MINI_TILE,"MiniTileViewBox",WS_TABSTOP,22,116,
-                    56,52,WS_EX_CLIENTEDGE
+    CONTROL         "Bitmap",IDC_BITMAP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,4,68,35,10
+    CONTROL         "256 colors",IDC_256COUL,"Button",BS_AUTORADIOBUTTON,4,80,55,10
+    CONTROL         "16 colors",IDC_16COUL,"Button",BS_AUTORADIOBUTTON,4,92,50,10
+    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,369,164,75,14
+    CONTROL         "Edit",IDC_Tile_BOX,"TileViewBox",WS_TABSTOP,100,2,344,160,WS_EX_CLIENTEDGE
+    CONTROL         "Edit",IDC_MINI_TILE,"MiniTileViewBox",WS_TABSTOP,22,116,56,52,WS_EX_CLIENTEDGE
     LTEXT           "Tile num : 0",IDC_TILENUM,23,170,100,8
     PUSHBUTTON      "&Close",IDC_FERMER,198,164,50,14
 END
@@ -1075,15 +992,13 @@ BEGIN
 END
 
 SOUNDSETTINGSDLG DIALOG  0, 0, 174, 96
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Sound Settings"
 FONT 8, "MS Sans Serif"
 BEGIN
     GROUPBOX        "Sound Core Settings",-1,3,2,168,28
     LTEXT           "Sound Core",-1,10,14,40,10
-    COMBOBOX        IDC_SOUNDCORECB,54,13,110,33,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_SOUNDCORECB,54,13,110,33,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Other Settings",-1,3,31,168,43
     LTEXT           "Buffer Size",-1,10,42,60,10
     EDITTEXT        IDC_SOUNDBUFFERET,136,41,28,13
@@ -1094,37 +1009,24 @@ BEGIN
 END
 
 IDD_FIRMSETTINGS DIALOG  0, 0, 161, 145
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Firmware Settings"
 FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "&OK",IDOK,7,124,50,14
     PUSHBUTTON      "&Cancel",IDCANCEL,104,124,50,14
-    CONTROL         "Favourite Color:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,9,55,52,12
-    COMBOBOX        IDC_COMBO1,66,53,84,14,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Birth Month:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,9,72,52,12
-    COMBOBOX        IDC_COMBO2,66,71,84,14,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Birthday:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,9,90,52,12
-    COMBOBOX        IDC_COMBO3,66,88,84,14,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Language:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,9,106,52,12
-    COMBOBOX        IDC_COMBO4,66,105,84,14,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Nickname:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,9,17,52,12
-    EDITTEXT        IDC_EDIT1,66,14,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | 
-                    WS_GROUP
-    CONTROL         "Message:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,9,36,52,12
-    EDITTEXT        IDC_EDIT2,66,33,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | 
-                    WS_GROUP
+    CONTROL         "Favourite Color:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,55,52,12
+    COMBOBOX        IDC_COMBO1,66,53,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Birth Month:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,72,52,12
+    COMBOBOX        IDC_COMBO2,66,71,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Birthday:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,90,52,12
+    COMBOBOX        IDC_COMBO3,66,88,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Language:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,106,52,12
+    COMBOBOX        IDC_COMBO4,66,105,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Nickname:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,17,52,12
+    EDITTEXT        IDC_EDIT1,66,14,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP
+    CONTROL         "Message:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,36,52,12
+    EDITTEXT        IDC_EDIT2,66,33,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP
 END
 
 IDD_MATRIX_VIEWER DIALOGEX 0, 0, 364, 177
@@ -1134,146 +1036,79 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,307,156,50,14
     GROUPBOX        "Projection",IDC_MATRIX_VIEWER_PROJ_GROUP,7,86,173,65
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_11_EDIT,11,95,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_21_EDIT,11,108,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_31_EDIT,11,122,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_41_EDIT,11,135,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_12_EDIT,52,95,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_22_EDIT,52,108,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_32_EDIT,52,122,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_42_EDIT,52,135,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_13_EDIT,94,95,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_23_EDIT,94,108,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_33_EDIT,94,122,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_43_EDIT,94,135,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_14_EDIT,136,95,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_24_EDIT,136,108,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_34_EDIT,136,122,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_44_EDIT,136,135,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_11_EDIT,11,95,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_21_EDIT,11,108,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_31_EDIT,11,122,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_41_EDIT,11,135,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_12_EDIT,52,95,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_22_EDIT,52,108,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_32_EDIT,52,122,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_42_EDIT,52,135,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_13_EDIT,94,95,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_23_EDIT,94,108,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_33_EDIT,94,122,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_43_EDIT,94,135,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_14_EDIT,136,95,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_24_EDIT,136,108,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_34_EDIT,136,122,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_PROJ_44_EDIT,136,135,40,12,ES_AUTOHSCROLL | ES_READONLY
     GROUPBOX        "Position",IDC_MATRIX_VIEWER_COORD_GROUP,7,7,173,80
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_11_EDIT,11,15,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_21_EDIT,11,28,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_31_EDIT,11,42,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_41_EDIT,11,55,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_12_EDIT,52,15,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_22_EDIT,52,28,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_32_EDIT,52,42,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_42_EDIT,52,55,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_13_EDIT,94,15,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_23_EDIT,94,28,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_33_EDIT,94,42,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_43_EDIT,94,55,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_14_EDIT,136,15,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_24_EDIT,136,28,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_34_EDIT,136,42,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_COORD_44_EDIT,136,55,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    COMBOBOX        IDC_MATRIX_VIEWER_COORD_COMBO,136,70,40,88,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_11_EDIT,11,15,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_21_EDIT,11,28,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_31_EDIT,11,42,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_41_EDIT,11,55,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_12_EDIT,52,15,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_22_EDIT,52,28,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_32_EDIT,52,42,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_42_EDIT,52,55,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_13_EDIT,94,15,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_23_EDIT,94,28,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_33_EDIT,94,42,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_43_EDIT,94,55,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_14_EDIT,136,15,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_24_EDIT,136,28,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_34_EDIT,136,42,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_COORD_44_EDIT,136,55,40,12,ES_AUTOHSCROLL | ES_READONLY
+    COMBOBOX        IDC_MATRIX_VIEWER_COORD_COMBO,136,70,40,88,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Direction",IDC_MATRIX_VIEWER_DIR_GROUP,184,7,173,80
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_11_EDIT,188,15,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_21_EDIT,188,29,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_31_EDIT,188,42,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_41_EDIT,188,55,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_12_EDIT,228,15,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_22_EDIT,228,29,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_32_EDIT,228,42,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_42_EDIT,228,55,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_13_EDIT,270,15,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_23_EDIT,270,29,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_33_EDIT,270,42,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_43_EDIT,270,55,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_14_EDIT,312,15,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_24_EDIT,312,29,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_34_EDIT,312,42,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_DIR_44_EDIT,312,55,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    COMBOBOX        IDC_MATRIX_VIEWER_DIR_COMBO,312,71,40,88,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_11_EDIT,188,15,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_21_EDIT,188,29,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_31_EDIT,188,42,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_41_EDIT,188,55,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_12_EDIT,228,15,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_22_EDIT,228,29,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_32_EDIT,228,42,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_42_EDIT,228,55,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_13_EDIT,270,15,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_23_EDIT,270,29,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_33_EDIT,270,42,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_43_EDIT,270,55,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_14_EDIT,312,15,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_24_EDIT,312,29,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_34_EDIT,312,42,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_DIR_44_EDIT,312,55,40,12,ES_AUTOHSCROLL | ES_READONLY
+    COMBOBOX        IDC_MATRIX_VIEWER_DIR_COMBO,312,71,40,88,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Texture",IDC_MATRIX_VIEWER_TEX_GROUP,184,86,173,65
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_11_EDIT,187,95,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_21_EDIT,187,108,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_31_EDIT,187,122,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_41_EDIT,187,135,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_12_EDIT,228,95,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_22_EDIT,228,108,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_32_EDIT,228,122,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_42_EDIT,228,135,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_13_EDIT,270,95,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_23_EDIT,270,108,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_33_EDIT,270,122,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_43_EDIT,270,135,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_14_EDIT,312,95,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_24_EDIT,312,108,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_34_EDIT,312,122,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_MATRIX_VIEWER_TEX_44_EDIT,312,135,40,12,
-                    ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_11_EDIT,187,95,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_21_EDIT,187,108,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_31_EDIT,187,122,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_41_EDIT,187,135,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_12_EDIT,228,95,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_22_EDIT,228,108,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_32_EDIT,228,122,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_42_EDIT,228,135,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_13_EDIT,270,95,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_23_EDIT,270,108,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_33_EDIT,270,122,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_43_EDIT,270,135,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_14_EDIT,312,95,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_24_EDIT,312,108,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_34_EDIT,312,122,40,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_MATRIX_VIEWER_TEX_44_EDIT,312,135,40,12,ES_AUTOHSCROLL | ES_READONLY
 END
 
 IDD_ABOUT_BOX DIALOGEX 0, 0, 126, 246
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About desmume..."
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
@@ -1308,12 +1143,12 @@ BEGIN
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // Inglés (Estados Unidos) resources
+#endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// Francés (Francia) resources
+// French (France) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
 #ifdef _WIN32
@@ -1470,20 +1305,14 @@ STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU
 CAPTION "Visualisation de la memoire"
 FONT 8, "MS Sans Serif"
 BEGIN
-    CONTROL         "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,
-                    10,4,29,10
-    CONTROL         "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33,
-                    10
-    CONTROL         "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33,
-                    10
+    CONTROL         "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,29,10
+    CONTROL         "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33,10
+    CONTROL         "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33,10
     LTEXT           "Aller E:",IDC_STATIC,130,4,33,10
-    EDITTEXT        IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | 
-                    ES_WANTRETURN | WS_GROUP
+    EDITTEXT        IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP
     PUSHBUTTON      "&GO",IDC_GO,240,1,20,14
-    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,350,1,75,14
-    CONTROL         "Edit",IDC_MEM_BOX,"MemViewBox",WS_VSCROLL | WS_TABSTOP,
-                    4,16,424,142,WS_EX_CLIENTEDGE
+    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,350,1,75,14
+    CONTROL         "Edit",IDC_MEM_BOX,"MemViewBox",WS_VSCROLL | WS_TABSTOP,4,16,424,142,WS_EX_CLIENTEDGE
     PUSHBUTTON      "&Fermer",IDC_FERMER,185,162,50,14
 END
 
@@ -1492,21 +1321,16 @@ STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU
 CAPTION "Desassembleur"
 FONT 8, "MS Sans Serif"
 BEGIN
-    CONTROL         "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,10,4,35,10
+    CONTROL         "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,35,10
     CONTROL         "ARM",IDC_ARM,"Button",BS_AUTORADIOBUTTON,44,4,35,10
     CONTROL         "Thumb",IDC_THUMB,"Button",BS_AUTORADIOBUTTON,82,4,40,10
     LTEXT           "Aller E:",IDC_STATIC,130,4,33,10
-    EDITTEXT        IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | 
-                    ES_WANTRETURN | WS_GROUP
+    EDITTEXT        IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP
     PUSHBUTTON      "&GO",IDC_GO,240,1,20,14
-    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,300,1,75,14
-    CONTROL         "Edit",IDC_DES_BOX,"DesViewBox",WS_VSCROLL | WS_TABSTOP,
-                    4,16,296,150,WS_EX_CLIENTEDGE
+    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,300,1,75,14
+    CONTROL         "Edit",IDC_DES_BOX,"DesViewBox",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE
     PUSHBUTTON      "&Fermer",IDC_FERMER,185,170,50,14
-    EDITTEXT        IDC_SETPNUM,5,170,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | 
-                    ES_NUMBER | WS_GROUP
+    EDITTEXT        IDC_SETPNUM,5,170,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
     PUSHBUTTON      "&Step",IDC_STEP,75,170,50,14
     LTEXT           "R0   :",IDC_STATIC,304,16,17,8
     LTEXT           "R1   :",IDC_STATIC,304,24,17,8
@@ -1595,8 +1419,7 @@ STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU
 CAPTION "Log"
 FONT 8, "MS Sans Serif"
 BEGIN
-    CONTROL         "Edit",IDC_LOG,"LogView",WS_VSCROLL | WS_TABSTOP,4,4,292,
-                    280,WS_EX_CLIENTEDGE
+    CONTROL         "Edit",IDC_LOG,"LogView",WS_VSCROLL | WS_TABSTOP,4,4,292,280,WS_EX_CLIENTEDGE
     PUSHBUTTON      "&Fermer",IDC_FERMER,125,285,50,14
 END
 
@@ -1608,8 +1431,7 @@ BEGIN
     COMBOBOX        IDC_PAL_SELECT,15,3,90,14,CBS_DROPDOWN | WS_TABSTOP
     LTEXT           "Pal : 0",IDC_PALNUM,3,21,25,8
     SCROLLBAR       IDC_SCROLLER,30,18,20,14
-    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,60,18,75,14
+    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,18,75,14
     PUSHBUTTON      "&Fermer",IDC_FERMER,35,149,50,14
 END
 
@@ -1622,18 +1444,12 @@ BEGIN
     LTEXT           "Pal : 0",IDC_PALNUM,4,31,25,8
     SCROLLBAR       IDC_SCROLLER,30,28,20,14
     COMBOBOX        IDC_MEM_SELECT,4,50,90,14,CBS_DROPDOWN | WS_TABSTOP
-    CONTROL         "Bitmap",IDC_BITMAP,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,4,68,35,10
-    CONTROL         "256 couleurs",IDC_256COUL,"Button",BS_AUTORADIOBUTTON,4,
-                    80,55,10
-    CONTROL         "16 couleurs",IDC_16COUL,"Button",BS_AUTORADIOBUTTON,4,
-                    92,50,10
-    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,369,164,75,14
-    CONTROL         "Edit",IDC_Tile_BOX,"TileViewBox",WS_TABSTOP,100,2,344,
-                    160,WS_EX_CLIENTEDGE
-    CONTROL         "Edit",IDC_MINI_TILE,"MiniTileViewBox",WS_TABSTOP,22,116,
-                    56,52,WS_EX_CLIENTEDGE
+    CONTROL         "Bitmap",IDC_BITMAP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,4,68,35,10
+    CONTROL         "256 couleurs",IDC_256COUL,"Button",BS_AUTORADIOBUTTON,4,80,55,10
+    CONTROL         "16 couleurs",IDC_16COUL,"Button",BS_AUTORADIOBUTTON,4,92,50,10
+    CONTROL         "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,369,164,75,14
+    CONTROL         "Edit",IDC_Tile_BOX,"TileViewBox",WS_TABSTOP,100,2,344,160,WS_EX_CLIENTEDGE
+    CONTROL         "Edit",IDC_MINI_TILE,"MiniTileViewBox",WS_TABSTOP,22,116,56,52,WS_EX_CLIENTEDGE
     LTEXT           "Tile num : 0",IDC_TILENUM,23,170,100,8
     PUSHBUTTON      "&Fermer",IDC_FERMER,198,164,50,14
 END
@@ -1690,7 +1506,7 @@ BEGIN
     PUSHBUTTON      "&Fermer",IDC_FERMER,50,134,50,14
 END
 
-#endif    // Francés (Francia) resources
+#endif    // French (France) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/desmume/src/windows/yopyop_private.rc b/desmume/src/windows/yopyop_private.rc
index 8b02076f7..96a76f508 100644
--- a/desmume/src/windows/yopyop_private.rc
+++ b/desmume/src/windows/yopyop_private.rc
@@ -7,13 +7,6 @@
 
 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "DeSmuME.ico"
 
-//
-// SUPPORT FOR WINDOWS XP THEMES:
-// THIS WILL MAKE THE PROGRAM USE THE COMMON CONTROLS
-// LIBRARY VERSION 6.0 (IF IT IS AVAILABLE)
-//
-1 24 "DeSmuME.exe.Manifest"
-
 //
 // TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS...
 //