diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h
index df25c9fec..a2b660b3c 100644
--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@@ -163,7 +163,9 @@
 #define IDD_BGMAP_VIEWER                        911
 #define IDB_BGTILES                             913
 #define IDD_EMULATIONSETTINGS                   916
+#define IDD_WIFISETTINGS                        918
 #define IDC_BGMAP_SEL                           1000
+#define IDC_BRIDGEADAPTER                       1000
 #define IDC_EDIT03                              1000
 #define IDC_SOUNDCORECB                         1000
 #define IDC_USEEXTBIOS                          1000
@@ -390,6 +392,7 @@
 #define IDM_EMULATIONSETTINGS                   40004
 #define IDC_FRAMELIMIT                          40005
 #define IDC_WINDOW1_5X                          40006
+#define IDM_WIFISETTINGS                        40007
 #define ID_VIEW_FRAMECOUNTER                    40009
 #define ID_VIEW_DISPLAYFPS                      40010
 #define IDM_FILE_RECORDAVI                      40015
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index 2d87c0bc3..26db6e746 100644
--- a/desmume/src/windows/resources.rc
+++ b/desmume/src/windows/resources.rc
@@ -129,7 +129,9 @@ BEGIN
         MENUITEM "Indput Indstillinger", IDM_CONFIG
         MENUITEM "Hotkey Config", IDM_HOTKEY_CONFIG
         MENUITEM "Lyd Indstillinger", IDM_SOUNDSETTINGS
+        MENUITEM "Wifi settings", IDM_WIFISETTINGS, GRAYED
         MENUITEM "Firmware Indstillinger", IDM_FIRMSETTINGS
+        MENUITEM "Emulation settings", IDM_EMULATIONSETTINGS
         POPUP "&Frame Skip"
         BEGIN
             MENUITEM "Limit to 60", IDC_FRAMELIMIT
@@ -293,6 +295,7 @@ BEGIN
         MENUITEM "Control Config", IDM_CONFIG
         MENUITEM "Hotkey Config", IDM_HOTKEY_CONFIG
         MENUITEM "Sound Settings", IDM_SOUNDSETTINGS
+        MENUITEM "Wifi settings", IDM_WIFISETTINGS, GRAYED
         MENUITEM "Firmware Settings", IDM_FIRMSETTINGS
         MENUITEM "Emulation Settings", IDM_EMULATIONSETTINGS
         POPUP "&Frame Skip"
@@ -457,7 +460,9 @@ BEGIN
         MENUITEM "Config. des contrôles", IDM_CONFIG
         MENUITEM "Hotkey Config", IDM_HOTKEY_CONFIG
         MENUITEM "Config. du son", IDM_SOUNDSETTINGS
+        MENUITEM "Config. wifi", IDM_WIFISETTINGS, GRAYED
         MENUITEM "Config. du firmware", IDM_FIRMSETTINGS
+        MENUITEM "Config. d'émulation", IDM_EMULATIONSETTINGS
         POPUP "&Frame Skip"
         BEGIN
             MENUITEM "Limit to 60", IDC_FRAMELIMIT
@@ -1213,6 +1218,21 @@ END
 
 
 
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+IDD_WIFISETTINGS DIALOG 0, 0, 331, 91
+STYLE DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU
+CAPTION "Wifi settings"
+FONT 8, "Ms Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "OK", IDOK, 220, 70, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel", IDCANCEL, 275, 70, 50, 14, BS_PUSHBUTTON
+    GROUPBOX        "Network adapter settings", IDC_STATIC, 5, 5, 320, 60
+    LTEXT           "Bridge network adapter:", IDC_STATIC, 15, 20, 76, 8, SS_LEFT
+    COMBOBOX        IDC_BRIDGEADAPTER, 15, 30, 300, 45, CBS_DROPDOWNLIST | CBS_HASSTRINGS
+END
+
+
+
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 IDD_EMULATIONSETTINGS DIALOG 0, 0, 241, 270
 STYLE DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU
@@ -1984,7 +2004,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 IDD_MEM_VIEWER7 DIALOGEX 0, 0, 428, 178
 STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "View Memory"
-FONT 8, "MS Shell Dlg", 0, 0, 1
+FONT 8, "MS Sans Serif", 400, 0, 0
 BEGIN
     AUTORADIOBUTTON "8 bit", IDC_8_BIT, 10, 4, 29, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON
     AUTORADIOBUTTON "16 bit", IDC_16_BIT, 44, 4, 33, 10, WS_TABSTOP | BS_AUTORADIOBUTTON