diff --git a/po/wxvbam/wxvbam.pot b/po/wxvbam/wxvbam.pot
index e43d8298..fab44f49 100644
--- a/po/wxvbam/wxvbam.pot
+++ b/po/wxvbam/wxvbam.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-04 13:53-0700\n"
+"POT-Creation-Date: 2023-04-09 20:27-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -120,199 +120,159 @@ msgstr ""
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr ""
 
-#: guiinit.cpp:89
-msgid "Start!"
-msgstr ""
-
-#: guiinit.cpp:108 xrc/NetLink.xrc:99
-msgid "Connect"
-msgstr ""
-
-#: guiinit.cpp:125
-msgid "You must enter a valid host name"
-msgstr ""
-
-#: guiinit.cpp:126
-msgid "Host name invalid"
-msgstr ""
-
-#: guiinit.cpp:144
-msgid "Waiting for clients..."
-msgstr ""
-
-#: guiinit.cpp:145
-#, c-format
-msgid "Server IP address is: %s\n"
-msgstr ""
-
-#: guiinit.cpp:147
-msgid "Waiting for connection..."
-msgstr ""
-
-#: guiinit.cpp:148
-#, c-format
-msgid "Connecting to %s\n"
-msgstr ""
-
-#: guiinit.cpp:181
-msgid ""
-"Error occurred.\n"
-"Please try again."
-msgstr ""
-
-#: guiinit.cpp:248 guiinit.cpp:301
+#: guiinit.cpp:132 guiinit.cpp:185
 msgid "Select cheat file"
 msgstr ""
 
-#: guiinit.cpp:249
+#: guiinit.cpp:133
 msgid "VBA cheat lists (*.clt)|*.clt|CHT cheat lists (*.cht)|*.cht"
 msgstr ""
 
-#: guiinit.cpp:268 panel.cpp:513
+#: guiinit.cpp:152 panel.cpp:519
 msgid "Loaded cheats"
 msgstr ""
 
-#: guiinit.cpp:302
+#: guiinit.cpp:186
 msgid "VBA cheat lists (*.clt)|*.clt"
 msgstr ""
 
-#: guiinit.cpp:320
+#: guiinit.cpp:204
 msgid "Saved cheats"
 msgstr ""
 
-#: guiinit.cpp:351 guiinit.cpp:370
+#: guiinit.cpp:235 guiinit.cpp:254
 msgid "Restore old values?"
 msgstr ""
 
-#: guiinit.cpp:352 guiinit.cpp:371
+#: guiinit.cpp:236 guiinit.cpp:255
 msgid "Removing cheats"
 msgstr ""
 
-#: guiinit.cpp:762 xrc/JoyPanel.xrc:364
+#: guiinit.cpp:646 xrc/JoyPanel.xrc:364
 msgid "Game Shark"
 msgstr ""
 
-#: guiinit.cpp:763 cmdevents.cpp:712
+#: guiinit.cpp:647 cmdevents.cpp:656
 msgid "Game Genie"
 msgstr ""
 
-#: guiinit.cpp:765
+#: guiinit.cpp:649
 msgid "Generic Code"
 msgstr ""
 
-#: guiinit.cpp:766
+#: guiinit.cpp:650
 msgid "Game Shark Advance"
 msgstr ""
 
-#: guiinit.cpp:767
+#: guiinit.cpp:651
 msgid "Code Breaker Advance"
 msgstr ""
 
-#: guiinit.cpp:768
+#: guiinit.cpp:652
 msgid "Flashcart CHT"
 msgstr ""
 
-#: guiinit.cpp:836 guiinit.cpp:1091
+#: guiinit.cpp:720 guiinit.cpp:975
 msgid "Number cannot be empty"
 msgstr ""
 
-#: guiinit.cpp:886
+#: guiinit.cpp:770
 msgid "Search produced no results"
 msgstr ""
 
-#: guiinit.cpp:1049
+#: guiinit.cpp:933
 msgid "8-bit "
 msgstr ""
 
-#: guiinit.cpp:1053
+#: guiinit.cpp:937
 msgid "16-bit "
 msgstr ""
 
-#: guiinit.cpp:1057
+#: guiinit.cpp:941
 msgid "32-bit "
 msgstr ""
 
-#: guiinit.cpp:1063
+#: guiinit.cpp:947
 msgid "signed decimal"
 msgstr ""
 
-#: guiinit.cpp:1067
+#: guiinit.cpp:951
 msgid "unsigned decimal"
 msgstr ""
 
-#: guiinit.cpp:1071
+#: guiinit.cpp:955
 msgid "unsigned hexadecimal"
 msgstr ""
 
-#: guiinit.cpp:1472
+#: guiinit.cpp:1356
 #, c-format
 msgid "%d frames = %.2f ms"
 msgstr ""
 
-#: guiinit.cpp:1484
+#: guiinit.cpp:1368
 msgid "Default device"
 msgstr ""
 
-#: guiinit.cpp:1824
+#: guiinit.cpp:1708
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: guiinit.cpp:1824
+#: guiinit.cpp:1708
 msgid "Confirm"
 msgstr ""
 
-#: guiinit.cpp:2415
+#: guiinit.cpp:2299
 msgid "Main icon not found"
 msgstr ""
 
-#: guiinit.cpp:2433
+#: guiinit.cpp:2317
 msgid "Main display panel not found"
 msgstr ""
 
-#: guiinit.cpp:2599
+#: guiinit.cpp:2483
 #, c-format
 msgid "Duplicate menu accelerator: %s for %s and %s; keeping first"
 msgstr ""
 
-#: guiinit.cpp:2613
+#: guiinit.cpp:2497
 #, c-format
 msgid "Menu accelerator %s for %s overrides default for %s; keeping menu"
 msgstr ""
 
-#: guiinit.cpp:2752
+#: guiinit.cpp:2636
 #, c-format
 msgid "Invalid menu item %s; removing"
 msgstr ""
 
-#: guiinit.cpp:2951
+#: guiinit.cpp:2738
 msgid "Code"
 msgstr ""
 
-#: guiinit.cpp:2960
+#: guiinit.cpp:2747
 msgid "Description"
 msgstr ""
 
-#: guiinit.cpp:3034 xrc/CheatAdd.xrc:31
+#: guiinit.cpp:2821 xrc/CheatAdd.xrc:31
 msgid "Address"
 msgstr ""
 
-#: guiinit.cpp:3035
+#: guiinit.cpp:2822
 msgid "Old Value"
 msgstr ""
 
-#: guiinit.cpp:3036
+#: guiinit.cpp:2823
 msgid "New Value"
 msgstr ""
 
-#: guiinit.cpp:3394
+#: guiinit.cpp:3171
 msgid "Menu commands"
 msgstr ""
 
-#: guiinit.cpp:3417
+#: guiinit.cpp:3194
 msgid "Other commands"
 msgstr ""
 
-#: guiinit.cpp:3528
+#: guiinit.cpp:3288
 msgid "JoyBus host invalid; disabling"
 msgstr ""
 
@@ -321,7 +281,7 @@ msgid "Text files (*.txt;*.log)|*.txt;*.log|"
 msgstr ""
 
 #: viewers.cpp:563 viewers.cpp:773 gfxviewers.cpp:1603 gfxviewers.cpp:1746
-#: cmdevents.cpp:1195 cmdevents.cpp:1273 cmdevents.cpp:1343 cmdevents.cpp:1414
+#: cmdevents.cpp:1139 cmdevents.cpp:1217 cmdevents.cpp:1287 cmdevents.cpp:1358
 #: viewsupt.cpp:1183
 msgid "Select output file"
 msgstr ""
@@ -408,11 +368,11 @@ msgid ""
 "Table (*.act)|*.act"
 msgstr ""
 
-#: gfxviewers.cpp:1604 gfxviewers.cpp:1747 cmdevents.cpp:1196 viewsupt.cpp:1184
+#: gfxviewers.cpp:1604 gfxviewers.cpp:1747 cmdevents.cpp:1140 viewsupt.cpp:1184
 msgid "PNG images|*.png|BMP images|*.bmp"
 msgstr ""
 
-#: cmdevents.cpp:134
+#: cmdevents.cpp:132
 msgid ""
 "Game Boy Advance Files (*.agb;*.gba;*.bin;*.elf;*.mb;*.zip;*.7z;*.rar)|*.agb;"
 "*.gba;*.bin;*.elf;*.mb;*.agb.gz;*.gba.gz;*.bin.gz;*.elf.gz;*.mb.gz;*.agb.z;*."
@@ -422,379 +382,379 @@ msgid ""
 "*.7z;*.rar|"
 msgstr ""
 
-#: cmdevents.cpp:145
+#: cmdevents.cpp:143
 msgid "Open ROM file"
 msgstr ""
 
-#: cmdevents.cpp:166
+#: cmdevents.cpp:164
 msgid ""
 "Game Boy Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|*.dmg;*.gb;*."
 "gbc;*.cgb;*.sgb;*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;*.dmg.z;*.gb.z;*."
 "gbc.z;*.cgb.z;*.sgb.z;*.zip;*.7z;*.rar|"
 msgstr ""
 
-#: cmdevents.cpp:172
+#: cmdevents.cpp:170
 msgid "Open GB ROM file"
 msgstr ""
 
-#: cmdevents.cpp:193
+#: cmdevents.cpp:191
 msgid ""
 "Game Boy Color Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|*.dmg;*."
 "gb;*.gbc;*.cgb;*.sgb;*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;*.dmg.z;*."
 "gb.z;*.gbc.z;*.cgb.z;*.sgb.z;*.zip;*.7z;*.rar|"
 msgstr ""
 
-#: cmdevents.cpp:199
+#: cmdevents.cpp:197
 msgid "Open GBC ROM file"
 msgstr ""
 
-#: cmdevents.cpp:620 cmdevents.cpp:736 cmdevents.cpp:775 cmdevents.cpp:848
+#: cmdevents.cpp:564 cmdevents.cpp:680 cmdevents.cpp:719 cmdevents.cpp:792
 msgid "Unknown"
 msgstr ""
 
-#: cmdevents.cpp:628
+#: cmdevents.cpp:572
 msgid "ROM"
 msgstr ""
 
-#: cmdevents.cpp:632
+#: cmdevents.cpp:576
 msgid "ROM + MBC1"
 msgstr ""
 
-#: cmdevents.cpp:636
+#: cmdevents.cpp:580
 msgid "ROM + MBC1 + RAM"
 msgstr ""
 
-#: cmdevents.cpp:640
+#: cmdevents.cpp:584
 msgid "ROM + MBC1 + RAM + BATT"
 msgstr ""
 
-#: cmdevents.cpp:644
+#: cmdevents.cpp:588
 msgid "ROM + MBC2"
 msgstr ""
 
-#: cmdevents.cpp:648
+#: cmdevents.cpp:592
 msgid "ROM + MBC2 + BATT"
 msgstr ""
 
-#: cmdevents.cpp:652
+#: cmdevents.cpp:596
 msgid "ROM + MMM01"
 msgstr ""
 
-#: cmdevents.cpp:656
+#: cmdevents.cpp:600
 msgid "ROM + MMM01 + RAM"
 msgstr ""
 
-#: cmdevents.cpp:660
+#: cmdevents.cpp:604
 msgid "ROM + MMM01 + RAM + BATT"
 msgstr ""
 
-#: cmdevents.cpp:664
+#: cmdevents.cpp:608
 msgid "ROM + MBC3 + TIMER + BATT"
 msgstr ""
 
-#: cmdevents.cpp:668
+#: cmdevents.cpp:612
 msgid "ROM + MBC3 + TIMER + RAM + BATT"
 msgstr ""
 
-#: cmdevents.cpp:672
+#: cmdevents.cpp:616
 msgid "ROM + MBC3"
 msgstr ""
 
-#: cmdevents.cpp:676
+#: cmdevents.cpp:620
 msgid "ROM + MBC3 + RAM"
 msgstr ""
 
-#: cmdevents.cpp:680
+#: cmdevents.cpp:624
 msgid "ROM + MBC3 + RAM + BATT"
 msgstr ""
 
-#: cmdevents.cpp:684
+#: cmdevents.cpp:628
 msgid "ROM + MBC5"
 msgstr ""
 
-#: cmdevents.cpp:688
+#: cmdevents.cpp:632
 msgid "ROM + MBC5 + RAM"
 msgstr ""
 
-#: cmdevents.cpp:692
+#: cmdevents.cpp:636
 msgid "ROM + MBC5 + RAM + BATT"
 msgstr ""
 
-#: cmdevents.cpp:696
+#: cmdevents.cpp:640
 msgid "ROM + MBC5 + RUMBLE"
 msgstr ""
 
-#: cmdevents.cpp:700
+#: cmdevents.cpp:644
 msgid "ROM + MBC5 + RUMBLE + RAM"
 msgstr ""
 
-#: cmdevents.cpp:704
+#: cmdevents.cpp:648
 msgid "ROM + MBC5 + RUMBLE + RAM + BATT"
 msgstr ""
 
-#: cmdevents.cpp:708
+#: cmdevents.cpp:652
 msgid "ROM + MBC7 + BATT"
 msgstr ""
 
-#: cmdevents.cpp:716
+#: cmdevents.cpp:660
 msgid "Game Shark 3.0"
 msgstr ""
 
-#: cmdevents.cpp:720
+#: cmdevents.cpp:664
 msgid "ROM + POCKET CAMERA"
 msgstr ""
 
-#: cmdevents.cpp:724
+#: cmdevents.cpp:668
 msgid "ROM + BANDAI TAMA5"
 msgstr ""
 
-#: cmdevents.cpp:728
+#: cmdevents.cpp:672
 msgid "ROM + HuC-3"
 msgstr ""
 
-#: cmdevents.cpp:732
+#: cmdevents.cpp:676
 msgid "ROM + HuC-1"
 msgstr ""
 
-#: cmdevents.cpp:782 dialogs/display-config.cpp:341 xrc/DisplayConfig.xrc:85
+#: cmdevents.cpp:726 dialogs/display-config.cpp:341 xrc/DisplayConfig.xrc:85
 #: xrc/DisplayConfig.xrc:135 xrc/DisplayConfig.xrc:221
 #: xrc/GameBoyAdvanceConfig.xrc:32 xrc/GameBoyAdvanceConfig.xrc:204
 #: xrc/SoundConfig.xrc:219 xrc/SoundConfig.xrc:309
 msgid "None"
 msgstr ""
 
-#: cmdevents.cpp:884 cmdevents.cpp:906
+#: cmdevents.cpp:828 cmdevents.cpp:850
 msgid "Select Dot Code file"
 msgstr ""
 
-#: cmdevents.cpp:886 cmdevents.cpp:908
+#: cmdevents.cpp:830 cmdevents.cpp:852
 msgid "e-Reader Dot Code (*.bin;*.raw)|*.bin;*.raw"
 msgstr ""
 
-#: cmdevents.cpp:927 cmdevents.cpp:1122
+#: cmdevents.cpp:871 cmdevents.cpp:1066
 msgid "Select battery file"
 msgstr ""
 
-#: cmdevents.cpp:928 cmdevents.cpp:1123
+#: cmdevents.cpp:872 cmdevents.cpp:1067
 msgid "Battery file (*.sav)|*.sav|Flash save (*.dat)|*.dat"
 msgstr ""
 
-#: cmdevents.cpp:936
+#: cmdevents.cpp:880
 msgid ""
 "Importing a battery file will erase any saved games (permanently after the "
 "next write). Do you want to continue?"
 msgstr ""
 
-#: cmdevents.cpp:937 cmdevents.cpp:965 cmdevents.cpp:1085
+#: cmdevents.cpp:881 cmdevents.cpp:909 cmdevents.cpp:1029
 msgid "Confirm import"
 msgstr ""
 
-#: cmdevents.cpp:943 panel.cpp:456
+#: cmdevents.cpp:887 panel.cpp:462
 #, c-format
 msgid "Loaded battery %s"
 msgstr ""
 
-#: cmdevents.cpp:945
+#: cmdevents.cpp:889
 #, c-format
 msgid "Error loading battery %s"
 msgstr ""
 
-#: cmdevents.cpp:954
+#: cmdevents.cpp:898
 msgid "Select code file"
 msgstr ""
 
-#: cmdevents.cpp:955
+#: cmdevents.cpp:899
 msgid "Game Shark Code File (*.spc;*.xpc)|*.spc;*.xpc"
 msgstr ""
 
-#: cmdevents.cpp:955
+#: cmdevents.cpp:899
 msgid "Game Shark Code File (*.gcf)|*.gcf"
 msgstr ""
 
-#: cmdevents.cpp:964
+#: cmdevents.cpp:908
 msgid ""
 "Importing a code file will replace any loaded cheats. Do you want to "
 "continue?"
 msgstr ""
 
-#: cmdevents.cpp:981
+#: cmdevents.cpp:925
 #, c-format
 msgid "Cannot open file %s"
 msgstr ""
 
-#: cmdevents.cpp:991
+#: cmdevents.cpp:935
 #, c-format
 msgid "Unsupported code file %s"
 msgstr ""
 
-#: cmdevents.cpp:1061
+#: cmdevents.cpp:1005
 #, c-format
 msgid "Loaded code file %s"
 msgstr ""
 
-#: cmdevents.cpp:1063
+#: cmdevents.cpp:1007
 #, c-format
 msgid "Error loading code file %s"
 msgstr ""
 
-#: cmdevents.cpp:1074 cmdevents.cpp:1150
+#: cmdevents.cpp:1018 cmdevents.cpp:1094
 msgid "Select snapshot file"
 msgstr ""
 
-#: cmdevents.cpp:1075
+#: cmdevents.cpp:1019
 msgid ""
 "Game Shark & PAC Snapshots (*.sps;*.xps)|*.sps;*.xps|Game Shark SP Snapshots "
 "(*.gsv)|*.gsv"
 msgstr ""
 
-#: cmdevents.cpp:1075
+#: cmdevents.cpp:1019
 msgid "Game Boy Snapshot (*.gbs)|*.gbs"
 msgstr ""
 
-#: cmdevents.cpp:1084
+#: cmdevents.cpp:1028
 msgid ""
 "Importing a snapshot file will erase any saved games (permanently after the "
 "next write). Do you want to continue?"
 msgstr ""
 
-#: cmdevents.cpp:1109
+#: cmdevents.cpp:1053
 #, c-format
 msgid "Loaded snapshot file %s"
 msgstr ""
 
-#: cmdevents.cpp:1111
+#: cmdevents.cpp:1055
 #, c-format
 msgid "Error loading snapshot file %s"
 msgstr ""
 
-#: cmdevents.cpp:1134
+#: cmdevents.cpp:1078
 #, c-format
 msgid "Wrote battery %s"
 msgstr ""
 
-#: cmdevents.cpp:1136 panel.cpp:763
+#: cmdevents.cpp:1080 panel.cpp:774
 #, c-format
 msgid "Error writing battery %s"
 msgstr ""
 
-#: cmdevents.cpp:1144
+#: cmdevents.cpp:1088
 msgid "EEPROM saves cannot be exported"
 msgstr ""
 
-#: cmdevents.cpp:1151
+#: cmdevents.cpp:1095
 msgid "Game Shark Snapshot (*.sps)|*.sps"
 msgstr ""
 
-#: cmdevents.cpp:1165
+#: cmdevents.cpp:1109
 msgid "Exported from Visual Boy Advance-M"
 msgstr ""
 
-#: cmdevents.cpp:1177
+#: cmdevents.cpp:1121
 #, c-format
 msgid "Saved snapshot file %s"
 msgstr ""
 
-#: cmdevents.cpp:1179
+#: cmdevents.cpp:1123
 #, c-format
 msgid "Error saving snapshot file %s"
 msgstr ""
 
-#: cmdevents.cpp:1220 sys.cpp:574
+#: cmdevents.cpp:1164 sys.cpp:574
 #, c-format
 msgid "Wrote snapshot %s"
 msgstr ""
 
-#: cmdevents.cpp:1241 cmdevents.cpp:1311 cmdevents.cpp:1382 cmdevents.cpp:1448
+#: cmdevents.cpp:1185 cmdevents.cpp:1255 cmdevents.cpp:1326 cmdevents.cpp:1392
 msgid " files ("
 msgstr ""
 
-#: cmdevents.cpp:1481
+#: cmdevents.cpp:1425
 msgid "Select file"
 msgstr ""
 
-#: cmdevents.cpp:1789 cmdevents.cpp:1882
+#: cmdevents.cpp:1729 cmdevents.cpp:1822
 msgid "Select state file"
 msgstr ""
 
-#: cmdevents.cpp:1790 cmdevents.cpp:1883
+#: cmdevents.cpp:1730 cmdevents.cpp:1823
 msgid "Visual Boy Advance saved game files|*.sgm"
 msgstr ""
 
-#: cmdevents.cpp:1913 cmdevents.cpp:1923 cmdevents.cpp:1934
+#: cmdevents.cpp:1853 cmdevents.cpp:1863 cmdevents.cpp:1874
 #, c-format
 msgid "Current state slot #%d"
 msgstr ""
 
-#: cmdevents.cpp:2003
+#: cmdevents.cpp:1939
 msgid "Cannot use Colorizer Hack when Game Boy BIOS File is enabled."
 msgstr ""
 
-#: cmdevents.cpp:2214
+#: cmdevents.cpp:2150
 msgid "Sound enabled"
 msgstr ""
 
-#: cmdevents.cpp:2214
+#: cmdevents.cpp:2150
 msgid "Sound disabled"
 msgstr ""
 
-#: cmdevents.cpp:2227 cmdevents.cpp:2241
+#: cmdevents.cpp:2163 cmdevents.cpp:2177
 #, c-format
 msgid "Volume: %d %%"
 msgstr ""
 
-#: cmdevents.cpp:2310
+#: cmdevents.cpp:2246
 msgid "Set to 0 for pseudo tty"
 msgstr ""
 
-#: cmdevents.cpp:2312
+#: cmdevents.cpp:2248
 msgid "Port to wait for connection:"
 msgstr ""
 
-#: cmdevents.cpp:2313
+#: cmdevents.cpp:2249
 msgid "GDB Connection"
 msgstr ""
 
-#: cmdevents.cpp:2366
+#: cmdevents.cpp:2301
 #, c-format
 msgid "Waiting for connection at %s"
 msgstr ""
 
-#: cmdevents.cpp:2373
+#: cmdevents.cpp:2308
 #, c-format
 msgid "Waiting for connection on port %d"
 msgstr ""
 
-#: cmdevents.cpp:2376
+#: cmdevents.cpp:2311
 msgid "Waiting for GDB..."
 msgstr ""
 
-#: cmdevents.cpp:2749 panel.cpp:255 panel.cpp:368
+#: cmdevents.cpp:2684 panel.cpp:262 panel.cpp:374
 msgid "Could not initialize the sound driver!"
 msgstr ""
 
-#: cmdevents.cpp:2812
+#: cmdevents.cpp:2747
 msgid ""
 "YOUR CONFIGURATION WILL BE DELETED!\n"
 "\n"
 "Are you sure?"
 msgstr ""
 
-#: cmdevents.cpp:2813
+#: cmdevents.cpp:2748
 msgid "FACTORY RESET"
 msgstr ""
 
-#: cmdevents.cpp:2848
+#: cmdevents.cpp:2783
 msgid "Nintendo Game Boy / Color / Advance emulator."
 msgstr ""
 
-#: cmdevents.cpp:2849
+#: cmdevents.cpp:2784
 msgid ""
 "Copyright (C) 1999-2003 Forgotten\n"
 "Copyright (C) 2004-2006 VBA development team\n"
 "Copyright (C) 2007-2020 VBA-M development team"
 msgstr ""
 
-#: cmdevents.cpp:2851
+#: cmdevents.cpp:2786
 msgid ""
 "This program is free software: you can redistribute it and / or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -810,15 +770,15 @@ msgid ""
 "along with this program. If not, see http://www.gnu.org/licenses ."
 msgstr ""
 
-#: cmdevents.cpp:3071
+#: cmdevents.cpp:2971
 msgid "Cannot use Game Boy BIOS when Colorizer Hack is enabled."
 msgstr ""
 
-#: cmdevents.cpp:3132
+#: cmdevents.cpp:3025
 msgid "LAN link is already active. Disable link mode to disconnect."
 msgstr ""
 
-#: cmdevents.cpp:3138
+#: cmdevents.cpp:3031
 msgid "Network is not supported in local mode."
 msgstr ""
 
@@ -946,177 +906,177 @@ msgstr ""
 msgid "Error setting up server socket (%d)"
 msgstr ""
 
-#: panel.cpp:177
+#: panel.cpp:185
 #, c-format
 msgid "%s is not a valid ROM file"
 msgstr ""
 
-#: panel.cpp:178 panel.cpp:239 panel.cpp:306
+#: panel.cpp:186 panel.cpp:247 panel.cpp:312
 msgid "Problem loading file"
 msgstr ""
 
-#: panel.cpp:238
+#: panel.cpp:246
 #, c-format
 msgid "Unable to load Game Boy ROM %s"
 msgstr ""
 
-#: panel.cpp:267
+#: panel.cpp:274
 msgid ""
 "Cannot use Game Boy BIOS file when Colorizer Hack is enabled, disabling Game "
 "Boy BIOS file."
 msgstr ""
 
-#: panel.cpp:282 panel.cpp:382
+#: panel.cpp:288 panel.cpp:388
 #, c-format
 msgid "Could not load BIOS %s"
 msgstr ""
 
-#: panel.cpp:305
+#: panel.cpp:311
 #, c-format
 msgid "Unable to load Game Boy Advance ROM %s"
 msgstr ""
 
-#: panel.cpp:545
+#: panel.cpp:556
 msgid " player "
 msgstr ""
 
-#: panel.cpp:711
+#: panel.cpp:722
 #, c-format
 msgid "Loaded state %s"
 msgstr ""
 
-#: panel.cpp:711
+#: panel.cpp:722
 #, c-format
 msgid "Error loading state %s"
 msgstr ""
 
-#: panel.cpp:735
+#: panel.cpp:746
 #, c-format
 msgid "Saved state %s"
 msgstr ""
 
-#: panel.cpp:735
+#: panel.cpp:746
 #, c-format
 msgid "Error saving state %s"
 msgstr ""
 
-#: panel.cpp:939
+#: panel.cpp:950
 #, c-format
 msgid "Fullscreen mode %d x %d - %d @ %d not supported; looking for another"
 msgstr ""
 
-#: panel.cpp:977
+#: panel.cpp:988
 #, c-format
 msgid "Fullscreen mode %d x %d - %d @ %d not supported"
 msgstr ""
 
-#: panel.cpp:982
+#: panel.cpp:993
 #, c-format
 msgid "Valid mode: %d x %d - %d @ %d"
 msgstr ""
 
-#: panel.cpp:990
+#: panel.cpp:1001
 #, c-format
 msgid "Chose mode %d x %d - %d @ %d"
 msgstr ""
 
-#: panel.cpp:994
+#: panel.cpp:1005
 #, c-format
 msgid "Failed to change mode to %d x %d - %d @ %d"
 msgstr ""
 
-#: panel.cpp:1084
+#: panel.cpp:1096
 msgid "Not a valid Game Boy Advance cartridge"
 msgstr ""
 
-#: panel.cpp:1252
+#: panel.cpp:1259
 msgid "No memory for rewinding"
 msgstr ""
 
-#: panel.cpp:1262
+#: panel.cpp:1269
 msgid "Error writing rewind state"
 msgstr ""
 
-#: panel.cpp:2280
+#: panel.cpp:2287
 msgid "Enabling EGL VSync."
 msgstr ""
 
-#: panel.cpp:2282
+#: panel.cpp:2289
 msgid "Disabling EGL VSync."
 msgstr ""
 
-#: panel.cpp:2289
+#: panel.cpp:2296
 msgid "Enabling GLX VSync."
 msgstr ""
 
-#: panel.cpp:2291
+#: panel.cpp:2298
 msgid "Disabling GLX VSync."
 msgstr ""
 
-#: panel.cpp:2309
+#: panel.cpp:2316
 msgid "Failed to set glXSwapIntervalEXT"
 msgstr ""
 
-#: panel.cpp:2318
+#: panel.cpp:2325
 msgid "Failed to set glXSwapIntervalSGI"
 msgstr ""
 
-#: panel.cpp:2327
+#: panel.cpp:2334
 msgid "Failed to set glXSwapIntervalMESA"
 msgstr ""
 
-#: panel.cpp:2334
+#: panel.cpp:2341
 msgid "No support for wglGetExtensionsStringEXT"
 msgstr ""
 
-#: panel.cpp:2337
+#: panel.cpp:2344
 msgid "No support for WGL_EXT_swap_control"
 msgstr ""
 
-#: panel.cpp:2346
+#: panel.cpp:2353
 msgid "Failed to set wglSwapIntervalEXT"
 msgstr ""
 
-#: panel.cpp:2352
+#: panel.cpp:2359
 msgid "No VSYNC available on this platform"
 msgstr ""
 
-#: panel.cpp:2452
+#: panel.cpp:2459
 msgid "memory allocation error"
 msgstr ""
 
-#: panel.cpp:2455
+#: panel.cpp:2462
 msgid "error initializing codec"
 msgstr ""
 
-#: panel.cpp:2458
+#: panel.cpp:2465
 msgid "error writing to output file"
 msgstr ""
 
-#: panel.cpp:2461
+#: panel.cpp:2468
 msgid "can't guess output format from file name"
 msgstr ""
 
-#: panel.cpp:2466
+#: panel.cpp:2473
 msgid "programming error; aborting!"
 msgstr ""
 
-#: panel.cpp:2478 panel.cpp:2507
+#: panel.cpp:2485 panel.cpp:2514
 #, c-format
 msgid "Unable to begin recording to %s (%s)"
 msgstr ""
 
-#: panel.cpp:2535
+#: panel.cpp:2542
 #, c-format
 msgid "Error in audio / video recording (%s); aborting"
 msgstr ""
 
-#: panel.cpp:2541
+#: panel.cpp:2548
 #, c-format
 msgid "Error in audio recording (%s); aborting"
 msgstr ""
 
-#: panel.cpp:2551
+#: panel.cpp:2558
 #, c-format
 msgid "Error in video recording (%s); aborting"
 msgstr ""
@@ -1133,174 +1093,178 @@ msgstr ""
 msgid "B:"
 msgstr ""
 
-#: config/internal/option-internal.cpp:353
+#: config/internal/option-internal.cpp:384
 msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
-#: config/internal/option-internal.cpp:354
+#: config/internal/option-internal.cpp:385
 msgid "Full-screen filter to apply"
 msgstr ""
 
-#: config/internal/option-internal.cpp:355
+#: config/internal/option-internal.cpp:386
 msgid "Filter plugin library"
 msgstr ""
 
-#: config/internal/option-internal.cpp:356
+#: config/internal/option-internal.cpp:387
 msgid "Interframe blending function"
 msgstr ""
 
-#: config/internal/option-internal.cpp:357
+#: config/internal/option-internal.cpp:388
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:359
+#: config/internal/option-internal.cpp:390
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:361
+#: config/internal/option-internal.cpp:392
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:362
+#: config/internal/option-internal.cpp:393
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:364
+#: config/internal/option-internal.cpp:395
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:368
+#: config/internal/option-internal.cpp:399
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:370
+#: config/internal/option-internal.cpp:401
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:372
+#: config/internal/option-internal.cpp:403
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:374
-#: config/internal/option-internal.cpp:400
+#: config/internal/option-internal.cpp:405
+#: config/internal/option-internal.cpp:431
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:376
+#: config/internal/option-internal.cpp:407
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:378
+#: config/internal/option-internal.cpp:409
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:381
+#: config/internal/option-internal.cpp:412
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:384
+#: config/internal/option-internal.cpp:415
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:418
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:420
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:391
-#: config/internal/option-internal.cpp:421
+#: config/internal/option-internal.cpp:422
+#: config/internal/option-internal.cpp:452
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:424
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:427
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:406
+#: config/internal/option-internal.cpp:437
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
+#: config/internal/option-internal.cpp:442
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:413
+#: config/internal/option-internal.cpp:444
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:414
+#: config/internal/option-internal.cpp:445
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:416
-msgid "Default network link port (server and client)"
+#: config/internal/option-internal.cpp:446
+msgid "Default network link port (client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:417
+#: config/internal/option-internal.cpp:447
+msgid "Default network link port (server)"
+msgstr ""
+
+#: config/internal/option-internal.cpp:448
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:418
+#: config/internal/option-internal.cpp:449
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:450
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:456
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:427
+#: config/internal/option-internal.cpp:458
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:429
+#: config/internal/option-internal.cpp:460
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:431
+#: config/internal/option-internal.cpp:462
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to "
 "ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:465
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:467
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:470
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:441
+#: config/internal/option-internal.cpp:472
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:473
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:477
 msgid ""
 "The parameter Joypad/<n>/<button> contains a comma-separated list of key "
 "names which map to joypad #<n> button <button>. Button is one of Up, Down, "
@@ -1308,254 +1272,254 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:452
+#: config/internal/option-internal.cpp:483
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:454
+#: config/internal/option-internal.cpp:485
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:489
 msgid ""
 "The parameter Keyboard/<cmd> contains a comma-separated list of key names (e."
 "g. Alt-Shift-F1).  When the named key is pressed, the command <cmd> is "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:464
+#: config/internal/option-internal.cpp:495
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:466
+#: config/internal/option-internal.cpp:497
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:499
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:470
+#: config/internal/option-internal.cpp:501
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:474
+#: config/internal/option-internal.cpp:505
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:476
+#: config/internal/option-internal.cpp:507
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:478
+#: config/internal/option-internal.cpp:509
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:479
+#: config/internal/option-internal.cpp:510
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:512
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:482
+#: config/internal/option-internal.cpp:513
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:484
+#: config/internal/option-internal.cpp:515
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:486
+#: config/internal/option-internal.cpp:517
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:488
+#: config/internal/option-internal.cpp:519
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:490
+#: config/internal/option-internal.cpp:521
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:523
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:525
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:497
+#: config/internal/option-internal.cpp:528
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:531
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:502
+#: config/internal/option-internal.cpp:533
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:535
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:537
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:507
+#: config/internal/option-internal.cpp:538
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:509
+#: config/internal/option-internal.cpp:540
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:511
+#: config/internal/option-internal.cpp:542
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:544
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:515
+#: config/internal/option-internal.cpp:546
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:548
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:520
+#: config/internal/option-internal.cpp:551
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:522
+#: config/internal/option-internal.cpp:553
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:525
+#: config/internal/option-internal.cpp:556
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:527
+#: config/internal/option-internal.cpp:558
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:529
+#: config/internal/option-internal.cpp:560
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:562
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:563
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:567
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:537
+#: config/internal/option-internal.cpp:568
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:570
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:571
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:572
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:573
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:547
+#: config/internal/option-internal.cpp:578
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:581
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:582
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:552
+#: config/internal/option-internal.cpp:584
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:588
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:590
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:591
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:592
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:594
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:596
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:598
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:599
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:601
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:602
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:572
+#: config/internal/option-internal.cpp:604
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:573
+#: config/internal/option-internal.cpp:605
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:574
+#: config/internal/option-internal.cpp:606
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:640
-#: config/internal/option-internal.cpp:660
-#: config/internal/option-internal.cpp:681
-#: config/internal/option-internal.cpp:701
-#: config/internal/option-internal.cpp:721
+#: config/internal/option-internal.cpp:672
+#: config/internal/option-internal.cpp:692
+#: config/internal/option-internal.cpp:713
+#: config/internal/option-internal.cpp:733
+#: config/internal/option-internal.cpp:753
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -1608,6 +1572,46 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
+#: dialogs/net-link.cpp:122
+msgid "Start!"
+msgstr ""
+
+#: dialogs/net-link.cpp:131
+msgid "Connect"
+msgstr ""
+
+#: dialogs/net-link.cpp:148
+msgid "You must enter a valid host name"
+msgstr ""
+
+#: dialogs/net-link.cpp:149
+msgid "Host name invalid"
+msgstr ""
+
+#: dialogs/net-link.cpp:169
+msgid "Waiting for clients..."
+msgstr ""
+
+#: dialogs/net-link.cpp:170
+#, c-format
+msgid "Server IP address is: %s\n"
+msgstr ""
+
+#: dialogs/net-link.cpp:174
+msgid "Waiting for connection..."
+msgstr ""
+
+#: dialogs/net-link.cpp:175
+#, c-format
+msgid "Connecting to %s\n"
+msgstr ""
+
+#: dialogs/net-link.cpp:207
+msgid ""
+"Error occurred.\n"
+"Please try again."
+msgstr ""
+
 #: widgets/keyedit.cpp:122 widgets/keyedit.cpp:280
 msgid "SHIFT"
 msgstr ""
@@ -2971,7 +2975,7 @@ msgid ""
 "entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:456
+#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:453
 msgid "Up"
 msgstr ""
 
@@ -2979,7 +2983,7 @@ msgstr ""
 msgid "A"
 msgstr ""
 
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:460
+#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:457
 msgid "Down"
 msgstr ""
 
@@ -2987,7 +2991,7 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:464
+#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:461
 msgid "Left"
 msgstr ""
 
@@ -2995,7 +2999,7 @@ msgstr ""
 msgid "L"
 msgstr ""
 
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:468
+#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:465
 msgid "Right"
 msgstr ""
 
@@ -3003,11 +3007,11 @@ msgstr ""
 msgid "R"
 msgstr ""
 
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:488
+#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:485
 msgid "Select"
 msgstr ""
 
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:492
+#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:489
 msgid "Start"
 msgstr ""
 
@@ -3087,14 +3091,6 @@ msgstr ""
 msgid "Player 4"
 msgstr ""
 
-#: xrc/LinkConfig.xrc:4
-msgid "Link configuration"
-msgstr ""
-
-#: xrc/LinkConfig.xrc:11
-msgid "Link timeout (in milliseconds)"
-msgstr ""
-
 #: xrc/Logging.xrc:4
 msgid "Logging"
 msgstr ""
@@ -3435,7 +3431,7 @@ msgstr ""
 msgid "&Game Cube"
 msgstr ""
 
-#: xrc/MainMenu.xrc:293 xrc/MainMenu.xrc:521
+#: xrc/MainMenu.xrc:293 xrc/MainMenu.xrc:518
 msgid "&Game Boy"
 msgstr ""
 
@@ -3451,388 +3447,387 @@ msgstr ""
 msgid "&Speed hack"
 msgstr ""
 
-#: xrc/MainMenu.xrc:310 xrc/MainMenu.xrc:316 xrc/MainMenu.xrc:387
-#: xrc/MainMenu.xrc:423
-msgid "&Configure..."
-msgstr ""
-
-#: xrc/MainMenu.xrc:314
+#: xrc/MainMenu.xrc:311
 msgid "&Video"
 msgstr ""
 
-#: xrc/MainMenu.xrc:320
+#: xrc/MainMenu.xrc:313 xrc/MainMenu.xrc:384 xrc/MainMenu.xrc:420
+msgid "&Configure..."
+msgstr ""
+
+#: xrc/MainMenu.xrc:317
 msgid "&Start in full screen"
 msgstr ""
 
-#: xrc/MainMenu.xrc:324
+#: xrc/MainMenu.xrc:321
 msgid "&Scaled resize"
 msgstr ""
 
-#: xrc/MainMenu.xrc:326
+#: xrc/MainMenu.xrc:323
 msgid "&1x"
 msgstr ""
 
-#: xrc/MainMenu.xrc:329
+#: xrc/MainMenu.xrc:326
 msgid "&2x"
 msgstr ""
 
-#: xrc/MainMenu.xrc:332
+#: xrc/MainMenu.xrc:329
 msgid "&3x"
 msgstr ""
 
-#: xrc/MainMenu.xrc:335
+#: xrc/MainMenu.xrc:332
 msgid "&4x"
 msgstr ""
 
-#: xrc/MainMenu.xrc:338
+#: xrc/MainMenu.xrc:335
 msgid "&5x"
 msgstr ""
 
-#: xrc/MainMenu.xrc:341
+#: xrc/MainMenu.xrc:338
 msgid "&6x"
 msgstr ""
 
-#: xrc/MainMenu.xrc:345
+#: xrc/MainMenu.xrc:342
 msgid "Change pixel filter"
 msgstr ""
 
-#: xrc/MainMenu.xrc:348
+#: xrc/MainMenu.xrc:345
 msgid "Change interframe blending"
 msgstr ""
 
-#: xrc/MainMenu.xrc:351
+#: xrc/MainMenu.xrc:348
 msgid "&Retain aspect ratio"
 msgstr ""
 
-#: xrc/MainMenu.xrc:356
+#: xrc/MainMenu.xrc:353
 msgid "&Bilinear filter"
 msgstr ""
 
-#: xrc/MainMenu.xrc:367
+#: xrc/MainMenu.xrc:364
 msgid "&Keep window on top"
 msgstr ""
 
-#: xrc/MainMenu.xrc:372
+#: xrc/MainMenu.xrc:369
 msgid "&Status bar"
 msgstr ""
 
-#: xrc/MainMenu.xrc:376
+#: xrc/MainMenu.xrc:373
 msgid "&Disable on-screen display"
 msgstr ""
 
-#: xrc/MainMenu.xrc:380
+#: xrc/MainMenu.xrc:377
 msgid "&Transparent on-screen display"
 msgstr ""
 
-#: xrc/MainMenu.xrc:385
+#: xrc/MainMenu.xrc:382
 msgid "&Audio"
 msgstr ""
 
-#: xrc/MainMenu.xrc:390
+#: xrc/MainMenu.xrc:387
 msgid "&Increase volume"
 msgstr ""
 
-#: xrc/MainMenu.xrc:394
+#: xrc/MainMenu.xrc:391
 msgid "&Decrease volume"
 msgstr ""
 
-#: xrc/MainMenu.xrc:398
+#: xrc/MainMenu.xrc:395
 msgid "&Toggle sound"
 msgstr ""
 
-#: xrc/MainMenu.xrc:403
+#: xrc/MainMenu.xrc:400
 msgid "&Game Boy Advance sound interpolation"
 msgstr ""
 
-#: xrc/MainMenu.xrc:408
+#: xrc/MainMenu.xrc:405
 msgid "&Game Boy sound enhancement"
 msgstr ""
 
-#: xrc/MainMenu.xrc:412
+#: xrc/MainMenu.xrc:409
 msgid "&Game Boy surround sound effect"
 msgstr ""
 
-#: xrc/MainMenu.xrc:416
+#: xrc/MainMenu.xrc:413
 msgid "&Game Boy sound declicking"
 msgstr ""
 
-#: xrc/MainMenu.xrc:421
+#: xrc/MainMenu.xrc:418
 msgid "&Input"
 msgstr ""
 
-#: xrc/MainMenu.xrc:426
+#: xrc/MainMenu.xrc:423
 msgid "Allow &keyboard background input"
 msgstr ""
 
-#: xrc/MainMenu.xrc:430
+#: xrc/MainMenu.xrc:427
 msgid "Allow &joystick background input"
 msgstr ""
 
-#: xrc/MainMenu.xrc:435
+#: xrc/MainMenu.xrc:432
 msgid "&Autofire"
 msgstr ""
 
-#: xrc/MainMenu.xrc:437 xrc/MainMenu.xrc:472
+#: xrc/MainMenu.xrc:434 xrc/MainMenu.xrc:469
 msgid "&A"
 msgstr ""
 
-#: xrc/MainMenu.xrc:441 xrc/MainMenu.xrc:476
+#: xrc/MainMenu.xrc:438 xrc/MainMenu.xrc:473
 msgid "&B"
 msgstr ""
 
-#: xrc/MainMenu.xrc:445 xrc/MainMenu.xrc:480
+#: xrc/MainMenu.xrc:442 xrc/MainMenu.xrc:477
 msgid "&L"
 msgstr ""
 
-#: xrc/MainMenu.xrc:449 xrc/MainMenu.xrc:484
+#: xrc/MainMenu.xrc:446 xrc/MainMenu.xrc:481
 msgid "&R"
 msgstr ""
 
-#: xrc/MainMenu.xrc:454
+#: xrc/MainMenu.xrc:451
 msgid "&Autohold"
 msgstr ""
 
-#: xrc/MainMenu.xrc:498
+#: xrc/MainMenu.xrc:495
 msgid "&Game Boy Advance"
 msgstr ""
 
-#: xrc/MainMenu.xrc:500 xrc/MainMenu.xrc:523
+#: xrc/MainMenu.xrc:497 xrc/MainMenu.xrc:520
 msgid "Configure..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:504
+#: xrc/MainMenu.xrc:501
 msgid "&Real-time clock"
 msgstr ""
 
-#: xrc/MainMenu.xrc:508
+#: xrc/MainMenu.xrc:505
 msgid "&Use BIOS file"
 msgstr ""
 
-#: xrc/MainMenu.xrc:512
+#: xrc/MainMenu.xrc:509
 msgid "&Debug print"
 msgstr ""
 
-#: xrc/MainMenu.xrc:516 xrc/MainMenu.xrc:531
+#: xrc/MainMenu.xrc:513 xrc/MainMenu.xrc:528
 msgid "&LCD Filter"
 msgstr ""
 
-#: xrc/MainMenu.xrc:527
+#: xrc/MainMenu.xrc:524
 msgid "&Game Boy color option"
 msgstr ""
 
-#: xrc/MainMenu.xrc:535
+#: xrc/MainMenu.xrc:532
 msgid "&Game Boy Colorizer Hack (requires restart)"
 msgstr ""
 
-#: xrc/MainMenu.xrc:539
+#: xrc/MainMenu.xrc:536
 msgid "&Game Boy printer"
 msgstr ""
 
-#: xrc/MainMenu.xrc:543
+#: xrc/MainMenu.xrc:540
 msgid "&Gather a full page before printing"
 msgstr ""
 
-#: xrc/MainMenu.xrc:547
+#: xrc/MainMenu.xrc:544
 msgid "&Save printouts as screen captures"
 msgstr ""
 
-#: xrc/MainMenu.xrc:552
+#: xrc/MainMenu.xrc:549
 msgid "&Use Game Boy BIOS file (requires restart)"
 msgstr ""
 
-#: xrc/MainMenu.xrc:556
+#: xrc/MainMenu.xrc:553
 msgid "&Use Game Boy Color BIOS file"
 msgstr ""
 
-#: xrc/MainMenu.xrc:561
+#: xrc/MainMenu.xrc:558
 msgid "&General..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:564
+#: xrc/MainMenu.xrc:561
 msgid "&Speedup / Turbo..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:567
+#: xrc/MainMenu.xrc:564
 msgid "D&irectories..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:570
+#: xrc/MainMenu.xrc:567
 msgid "&Key Shortcuts..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:573
+#: xrc/MainMenu.xrc:570
 msgid "&UI Settings..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:577
+#: xrc/MainMenu.xrc:574
 msgid "&Tools"
 msgstr ""
 
-#: xrc/MainMenu.xrc:579
+#: xrc/MainMenu.xrc:576
 msgid "&Cheats"
 msgstr ""
 
-#: xrc/MainMenu.xrc:581
+#: xrc/MainMenu.xrc:578
 msgid "List &cheats..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:584
+#: xrc/MainMenu.xrc:581
 msgid "Find c&heat..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:588
+#: xrc/MainMenu.xrc:585
 msgid "A&utomatically save / load cheats"
 msgstr ""
 
-#: xrc/MainMenu.xrc:592
+#: xrc/MainMenu.xrc:589
 msgid "&Enable cheats"
 msgstr ""
 
-#: xrc/MainMenu.xrc:599
+#: xrc/MainMenu.xrc:596
 msgid "&Break into GDB"
 msgstr ""
 
-#: xrc/MainMenu.xrc:603
+#: xrc/MainMenu.xrc:600
 msgid "&Configure port..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:606
+#: xrc/MainMenu.xrc:603
 msgid "&Break on load"
 msgstr ""
 
-#: xrc/MainMenu.xrc:611
+#: xrc/MainMenu.xrc:608
 msgid "&Disconnect"
 msgstr ""
 
-#: xrc/MainMenu.xrc:613
+#: xrc/MainMenu.xrc:610
 msgid "&GDB"
 msgstr ""
 
-#: xrc/MainMenu.xrc:616
+#: xrc/MainMenu.xrc:613
 msgid "&Disassemble..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:619
+#: xrc/MainMenu.xrc:616
 msgid "&Logging..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:622
+#: xrc/MainMenu.xrc:619
 msgid "&IO Viewer..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:625
+#: xrc/MainMenu.xrc:622
 msgid "&Map Viewer..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:628
+#: xrc/MainMenu.xrc:625
 msgid "M&emory Viewer..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:631
+#: xrc/MainMenu.xrc:628
 msgid "&OAM Viewer..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:634
+#: xrc/MainMenu.xrc:631
 msgid "&Palette Viewer..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:637
+#: xrc/MainMenu.xrc:634
 msgid "&Tile Viewer..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:642
+#: xrc/MainMenu.xrc:639
 msgid "Show all video layers"
 msgstr ""
 
-#: xrc/MainMenu.xrc:646
+#: xrc/MainMenu.xrc:643
 msgid "BG &0"
 msgstr ""
 
-#: xrc/MainMenu.xrc:651
+#: xrc/MainMenu.xrc:648
 msgid "BG &1"
 msgstr ""
 
-#: xrc/MainMenu.xrc:656
+#: xrc/MainMenu.xrc:653
 msgid "BG &2"
 msgstr ""
 
-#: xrc/MainMenu.xrc:661
+#: xrc/MainMenu.xrc:658
 msgid "BG &3"
 msgstr ""
 
-#: xrc/MainMenu.xrc:666
+#: xrc/MainMenu.xrc:663
 msgid "&OBJ"
 msgstr ""
 
-#: xrc/MainMenu.xrc:671
+#: xrc/MainMenu.xrc:668
 msgid "&WIN 0"
 msgstr ""
 
-#: xrc/MainMenu.xrc:676
+#: xrc/MainMenu.xrc:673
 msgid "W&IN 1"
 msgstr ""
 
-#: xrc/MainMenu.xrc:681
+#: xrc/MainMenu.xrc:678
 msgid "O&BJ WIN"
 msgstr ""
 
-#: xrc/MainMenu.xrc:685
+#: xrc/MainMenu.xrc:682
 msgid "&View Layers"
 msgstr ""
 
-#: xrc/MainMenu.xrc:689
+#: xrc/MainMenu.xrc:686
 msgid "Channel &1"
 msgstr ""
 
-#: xrc/MainMenu.xrc:694
+#: xrc/MainMenu.xrc:691
 msgid "Channel &2"
 msgstr ""
 
-#: xrc/MainMenu.xrc:699
+#: xrc/MainMenu.xrc:696
 msgid "Channel &3"
 msgstr ""
 
-#: xrc/MainMenu.xrc:704
+#: xrc/MainMenu.xrc:701
 msgid "Channel &4"
 msgstr ""
 
-#: xrc/MainMenu.xrc:709
+#: xrc/MainMenu.xrc:706
 msgid "Direct Sound &A"
 msgstr ""
 
-#: xrc/MainMenu.xrc:714
+#: xrc/MainMenu.xrc:711
 msgid "Direct Sound &B"
 msgstr ""
 
-#: xrc/MainMenu.xrc:718
+#: xrc/MainMenu.xrc:715
 msgid "&Sound Channels"
 msgstr ""
 
-#: xrc/MainMenu.xrc:722
+#: xrc/MainMenu.xrc:719
 msgid "&Help"
 msgstr ""
 
-#: xrc/MainMenu.xrc:724
+#: xrc/MainMenu.xrc:721
 msgid "Report &Bugs"
 msgstr ""
 
-#: xrc/MainMenu.xrc:727
+#: xrc/MainMenu.xrc:724
 msgid "Visual Boy Advance-M Support &Forum"
 msgstr ""
 
-#: xrc/MainMenu.xrc:730
+#: xrc/MainMenu.xrc:727
 msgid "Translations"
 msgstr ""
 
-#: xrc/MainMenu.xrc:738
+#: xrc/MainMenu.xrc:735
 msgid "Check for updates"
 msgstr ""
 
-#: xrc/MainMenu.xrc:741
+#: xrc/MainMenu.xrc:738
 msgid "&Factory Reset..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:745
+#: xrc/MainMenu.xrc:742
 msgid "&About..."
 msgstr ""
 
@@ -3916,42 +3911,46 @@ msgstr ""
 msgid "&Load..."
 msgstr ""
 
+#: xrc/NetLinkClientPanel.xrc:11 xrc/NetLinkServerPanel.xrc:47
+msgid "Server:"
+msgstr ""
+
+#: xrc/NetLinkClientPanel.xrc:23 xrc/NetLinkServerPanel.xrc:59
+msgid "Port:"
+msgstr ""
+
+#: xrc/NetLinkServerPanel.xrc:11
+msgid "Players:"
+msgstr ""
+
+#: xrc/NetLinkServerPanel.xrc:24
+msgid "2"
+msgstr ""
+
+#: xrc/NetLinkServerPanel.xrc:31
+msgid "3"
+msgstr ""
+
+#: xrc/NetLinkServerPanel.xrc:38
+msgid "4"
+msgstr ""
+
+#: xrc/NetLinkServerPanel.xrc:74
+msgid "Timeout:"
+msgstr ""
+
 #: xrc/NetLink.xrc:4
 msgid "Start Network Link"
 msgstr ""
 
-#: xrc/NetLink.xrc:11
+#: xrc/NetLink.xrc:16
 msgid "Server"
 msgstr ""
 
-#: xrc/NetLink.xrc:19
+#: xrc/NetLink.xrc:23
 msgid "Client"
 msgstr ""
 
-#: xrc/NetLink.xrc:32
-msgid "Players:"
-msgstr ""
-
-#: xrc/NetLink.xrc:41
-msgid "2"
-msgstr ""
-
-#: xrc/NetLink.xrc:49
-msgid "3"
-msgstr ""
-
-#: xrc/NetLink.xrc:56
-msgid "4"
-msgstr ""
-
-#: xrc/NetLink.xrc:67
-msgid "Server:"
-msgstr ""
-
-#: xrc/NetLink.xrc:81
-msgid "Port:"
-msgstr ""
-
 #: xrc/OAMViewer.xrc:4
 msgid "OAM Viewer"
 msgstr ""
diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
index 7399a86c..49954921 100644
--- a/src/wx/CMakeLists.txt
+++ b/src/wx/CMakeLists.txt
@@ -623,7 +623,6 @@ set(
     xrc/IOViewer.xrc
     xrc/JoyPanel.xrc
     xrc/JoypadConfig.xrc
-    xrc/LinkConfig.xrc
     xrc/Logging.xrc
     xrc/MainFrame.xrc
     xrc/MainIcon.xrc
@@ -631,6 +630,8 @@ set(
     xrc/MapViewer.xrc
     xrc/MemSelRegion.xrc
     xrc/MemViewer.xrc
+    xrc/NetLinkClientPanel.xrc
+    xrc/NetLinkServerPanel.xrc
     xrc/NetLink.xrc
     xrc/OAMViewer.xrc
     xrc/PaletteViewer.xrc
@@ -768,6 +769,7 @@ set(
     dialogs/directories-config.cpp
     dialogs/display-config.cpp
     dialogs/game-boy-config.cpp
+    dialogs/net-link.cpp
     widgets/group-check-box.cpp
     widgets/keep-on-top-styler.cpp
     widgets/keyedit.cpp
@@ -817,6 +819,7 @@ set(
     dialogs/directories-config.h
     dialogs/display-config.h
     dialogs/game-boy-config.h
+    dialogs/net-link.h
     dialogs/validated-child.h
     widgets/dpi-support.h
     widgets/group-check-box.h
diff --git a/src/wx/cmdevents.cpp b/src/wx/cmdevents.cpp
index 29a7c723..88be5290 100644
--- a/src/wx/cmdevents.cpp
+++ b/src/wx/cmdevents.cpp
@@ -3032,8 +3032,7 @@ EVT_HANDLER_MASK(LanLink, "Start Network link", CMDEN_LINK_ANY)
         return;
     }
 
-    wxDialog* dlg = GetXRCDialog("NetLink");
-    ShowModal(dlg);
+    ShowModal(GetXRCDialog("NetLink"));
     panel->SetFrameTitle();
 #endif
 }
@@ -3075,21 +3074,8 @@ EVT_HANDLER(SpeedOn, "Enable faster network protocol by default")
 
 EVT_HANDLER(LinkProto, "Local host IPC")
 {
-    GetMenuOptionConfig("LinkProto", config::OptionID::kGBALinkHost);
-}
-
-EVT_HANDLER(LinkConfigure, "Link options...")
-{
-#ifndef NO_LINK
-    wxDialog* dlg = GetXRCDialog("LinkConfig");
-
-    if (ShowModal(dlg) != wxID_OK)
-        return;
-
-    SetLinkTimeout(gopts.link_timeout);
-    update_opts();
+    GetMenuOptionConfig("LinkProto", config::OptionID::kGBALinkProto);
     EnableNetworkMenu();
-#endif
 }
 
 // Dummy for disabling system key bindings
diff --git a/src/wx/config/internal/option-internal.cpp b/src/wx/config/internal/option-internal.cpp
index d69aea5b..bea7a845 100644
--- a/src/wx/config/internal/option-internal.cpp
+++ b/src/wx/config/internal/option-internal.cpp
@@ -177,7 +177,12 @@ std::array<Option, kNbOptions>& Option::All() {
         bool gba_lcd_filter = false;
         bool link_auto = false;
         bool link_hacks = true;
+        wxString link_host = "127.0.0.1";  // quick fix for issues #48 and #445
+        wxString server_ip = "*";
+        int32_t link_port = 5738;
+        int32_t server_port = 5738;
         bool link_proto = false;
+        int32_t link_timeout = 500;
         wxString gba_rom_dir;
 
         /// Core
@@ -190,6 +195,9 @@ std::array<Option, kNbOptions>& Option::All() {
         uint32_t flash_size = 0;
         int32_t frame_skip = 0;
         bool gdb_break_on_load  = false;
+#ifndef NO_LINK
+        int32_t link_num_players = 2;
+#endif
         bool pause_when_inactive = false;
         uint32_t show_speed = 0;
         bool show_speed_transparent = false;
@@ -265,11 +273,12 @@ std::array<Option, kNbOptions>& Option::All() {
 #ifndef NO_LINK
         Option(OptionID::kGBALinkAuto, &g_owned_opts.link_auto),
         Option(OptionID::kGBALinkFast, &g_owned_opts.link_hacks),
-        Option(OptionID::kGBALinkHost, &gopts.link_host),
-        Option(OptionID::kGBAServerIP, &gopts.server_ip),
-        Option(OptionID::kGBALinkPort, &gopts.link_port, 0, 65535),
+        Option(OptionID::kGBALinkHost, &g_owned_opts.link_host),
+        Option(OptionID::kGBAServerIP, &g_owned_opts.server_ip),
+        Option(OptionID::kGBALinkPort, &g_owned_opts.link_port, 0, 65535),
+        Option(OptionID::kGBAServerPort, &g_owned_opts.server_port, 0, 65535),
         Option(OptionID::kGBALinkProto, &g_owned_opts.link_proto),
-        Option(OptionID::kGBALinkTimeout, &gopts.link_timeout, 0, 9999999),
+        Option(OptionID::kGBALinkTimeout, &g_owned_opts.link_timeout, 0, 9999999),
         Option(OptionID::kGBALinkType, &gopts.gba_link_type, 0, 5),
 #endif
         Option(OptionID::kGBAROMDir, &g_owned_opts.gba_rom_dir),
@@ -311,7 +320,7 @@ std::array<Option, kNbOptions>& Option::All() {
         Option(OptionID::kPrefGDBBreakOnLoad, &g_owned_opts.gdb_break_on_load),
         Option(OptionID::kPrefGDBPort, &gopts.gdb_port, 0, 65535),
 #ifndef NO_LINK
-        Option(OptionID::kPrefLinkNumPlayers, &gopts.link_num_players, 2, 4),
+        Option(OptionID::kPrefLinkNumPlayers, &g_owned_opts.link_num_players, 2, 4),
 #endif
         Option(OptionID::kPrefMaxScale, &gopts.max_scale, 0, 100),
         Option(OptionID::kPrefPauseWhenInactive, &g_owned_opts.pause_when_inactive),
@@ -434,8 +443,8 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
     },
     OptionData{"GBA/LinkHost", "", _("Default network link client host")},
     OptionData{"GBA/ServerIP", "", _("Default network link server IP to bind")},
-    OptionData{"GBA/LinkPort", "",
-               _("Default network link port (server and client)")},
+    OptionData{"GBA/LinkPort", "", _("Default network link port (client)")},
+    OptionData{"GBA/ServerPort", "", _("Default network link port (server)")},
     OptionData{"GBA/LinkProto", "LinkProto", _("Default network protocol")},
     OptionData{"GBA/LinkTimeout", "LinkTimeout", _("Link timeout (ms)")},
     OptionData{"GBA/LinkType", "LinkType", _("Link cable type")},
@@ -571,7 +580,8 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
                "AllowJoystickBackgroundInput",
                _("Capture joy events while on background")},
     OptionData{"ui/hideMenuBar", "", _("Hide menu bar when mouse is inactive")},
-    OptionData{"ui/suspendScreenSaver", "", _("Suspend screensaver when game is running")},
+    OptionData{"ui/suspendScreenSaver", "",
+               _("Suspend screensaver when game is running")},
 
     /// Sound
     OptionData{"Sound/AudioAPI", "",
diff --git a/src/wx/config/option-id.h b/src/wx/config/option-id.h
index 90973157..65592183 100644
--- a/src/wx/config/option-id.h
+++ b/src/wx/config/option-id.h
@@ -40,6 +40,7 @@ enum class OptionID {
     kGBALinkHost,
     kGBAServerIP,
     kGBALinkPort,
+    kGBAServerPort,
     kGBALinkProto,
     kGBALinkTimeout,
     kGBALinkType,
diff --git a/src/wx/config/option-proxy.h b/src/wx/config/option-proxy.h
index abc251df..31bc72ea 100644
--- a/src/wx/config/option-proxy.h
+++ b/src/wx/config/option-proxy.h
@@ -43,7 +43,8 @@ static constexpr std::array<Option::Type, kNbOptions> kOptionsTypes = {
     /*kGBALinkFast*/ Option::Type::kBool,
     /*kGBALinkHost*/ Option::Type::kString,
     /*kGBAServerIP*/ Option::Type::kString,
-    /*kGBALinkPort*/ Option::Type::kUnsigned,
+    /*kGBALinkPort*/ Option::Type::kInt,
+    /*kGBAServerPort*/ Option::Type::kInt,
     /*kGBALinkProto*/ Option::Type::kBool,
     /*kGBALinkTimeout*/ Option::Type::kInt,
     /*kGBALinkType*/ Option::Type::kInt,
diff --git a/src/wx/dialogs/net-link.cpp b/src/wx/dialogs/net-link.cpp
new file mode 100644
index 00000000..52f5d540
--- /dev/null
+++ b/src/wx/dialogs/net-link.cpp
@@ -0,0 +1,219 @@
+#include "net-link.h"
+
+#if !defined(NO_LINK)
+
+#include <wx/log.h>
+#include <wx/msgdlg.h>
+#include <wx/progdlg.h>
+#include <wx/radiobut.h>
+#include <wx/sizer.h>
+#include <wx/textctrl.h>
+#include <wx/valnum.h>
+#include <wx/xrc/xmlres.h>
+
+#include "../System.h"
+#include "config/option-proxy.h"
+#include "dialogs/validated-child.h"
+#include "widgets/option-validator.h"
+
+namespace dialogs {
+
+LinkMode GetConfiguredLinkMode() {
+    switch (OPTION(kGBALinkType)) {
+    case 0:
+        return LINK_DISCONNECTED;
+
+    case 1:
+        if (OPTION(kGBALinkProto))
+            return LINK_CABLE_IPC;
+        else
+            return LINK_CABLE_SOCKET;
+
+    case 2:
+        if (OPTION(kGBALinkProto))
+            return LINK_RFU_IPC;
+        else
+            return LINK_RFU_SOCKET;
+
+    case 3:
+        return LINK_GAMECUBE_DOLPHIN;
+
+    case 4:
+        if (OPTION(kGBALinkProto))
+            return LINK_GAMEBOY_IPC;
+        else
+            return LINK_GAMEBOY_SOCKET;
+
+    default:
+        return LINK_DISCONNECTED;
+    }
+}
+
+// static
+NetLink* NetLink::NewInstance(wxWindow* parent) {
+    assert(parent);
+    return new NetLink(parent);
+}
+
+NetLink::NetLink(wxWindow* parent) : wxDialog(), keep_on_top_styler_(this) {
+#if !wxCHECK_VERSION(3, 1, 0)
+    // This needs to be set before loading any element on the window. This also
+    // has no effect since wx 3.1.0, where it became the default.
+    this->SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY);
+#endif
+    assert(wxXmlResource::Get()->LoadDialog(this, parent, "NetLink"));
+
+    server_panel_ = GetValidatedChild(this, "NetLinkServerPanel");
+    client_panel_ = GetValidatedChild(this, "NetLinkClientPanel");
+    ok_button_ = this->FindWindow(wxID_OK);
+    assert(ok_button_);
+
+    wxWindow* server_button = GetValidatedChild(this, "Server");
+    server_button->Bind(
+        wxEVT_RADIOBUTTON,
+        std::bind(&NetLink::OnServerSelected, this, std::placeholders::_1),
+        server_button->GetId());
+    wxWindow* client_button = GetValidatedChild(this, "Client");
+    client_button->Bind(
+        wxEVT_RADIOBUTTON,
+        std::bind(&NetLink::OnClientSelected, this, std::placeholders::_1),
+        client_button->GetId());
+
+    // Server panel.
+    GetValidatedChild(this, "Link2P")
+        ->SetValidator(widgets::OptionIntValidator(
+            config::OptionID::kPrefLinkNumPlayers, 2));
+    GetValidatedChild(this, "Link3P")
+        ->SetValidator(widgets::OptionIntValidator(
+            config::OptionID::kPrefLinkNumPlayers, 3));
+    GetValidatedChild(this, "Link4P")
+        ->SetValidator(widgets::OptionIntValidator(
+            config::OptionID::kPrefLinkNumPlayers, 4));
+    GetValidatedChild(this, "ServerIP")
+        ->SetValidator(
+            widgets::OptionStringValidator(config::OptionID::kGBAServerIP));
+    GetValidatedChild(this, "ServerPort")
+        ->SetValidator(
+            widgets::OptionSpinCtrlValidator(config::OptionID::kGBAServerPort));
+    GetValidatedChild(this, "LinkTimeout")
+        ->SetValidator(widgets::OptionSpinCtrlValidator(
+            config::OptionID::kGBALinkTimeout));
+
+    // Client panel.
+    GetValidatedChild(this, "LinkHost")
+        ->SetValidator(
+            widgets::OptionStringValidator(config::OptionID::kGBALinkHost));
+    GetValidatedChild(this, "LinkPort")
+        ->SetValidator(
+            widgets::OptionSpinCtrlValidator(config::OptionID::kGBALinkPort));
+
+    // This should intercept wxID_OK before the dialog handler gets it.
+    ok_button_->Bind(
+        wxEVT_BUTTON,
+        std::bind(&NetLink::OnValidate, this, std::placeholders::_1),
+        ok_button_->GetId());
+
+    this->Fit();
+}
+
+void NetLink::OnServerSelected(wxCommandEvent& event) {
+    server_panel_->Enable(true);
+    client_panel_->Enable(false);
+    ok_button_->SetLabel(_("Start!"));
+
+    // Let the event propagate.
+    event.Skip();
+}
+
+void NetLink::OnClientSelected(wxCommandEvent& event) {
+    server_panel_->Enable(false);
+    client_panel_->Enable(true);
+    ok_button_->SetLabel(_("Connect"));
+
+    // Let the event propagate.
+    event.Skip();
+}
+
+void NetLink::OnValidate(wxCommandEvent& event) {
+    static const int kHostLength = 256;
+    if (!Validate() || !TransferDataFromWindow()) {
+        return;
+    }
+
+    const bool is_server_mode = server_panel_->IsEnabled();
+    if (!is_server_mode) {
+        const bool valid =
+            SetLinkServerHost(OPTION(kGBALinkHost).Get().utf8_str());
+        if (!valid) {
+            wxMessageBox(_("You must enter a valid host name"),
+                         _("Host name invalid"), wxICON_ERROR | wxOK);
+            return;
+        }
+    }
+
+    // Close any previous link.
+    CloseLink();
+    wxString connection_message;
+    wxString title;
+    SetLinkTimeout(OPTION(kGBALinkTimeout));
+    EnableSpeedHacks(OPTION(kGBALinkFast));
+    EnableLinkServer(is_server_mode, OPTION(kPrefLinkNumPlayers) - 1);
+
+    if (is_server_mode) {
+        // Server mode.
+        IP_LINK_PORT = OPTION(kGBAServerPort);
+        IP_LINK_BIND_ADDRESS = OPTION(kGBAServerIP).Get();
+
+        std::array<char, kHostLength> host;
+        GetLinkServerHost(host.data(), kHostLength);
+        title.Printf(_("Waiting for clients..."));
+        connection_message.Printf(_("Server IP address is: %s\n"),
+                       wxString(host.data(), wxConvLibc).c_str());
+    } else {
+        // Client mode.
+        title.Printf(_("Waiting for connection..."));
+        connection_message.Printf(_("Connecting to %s\n"), OPTION(kGBALinkHost).Get());
+    }
+
+    ConnectionState state = InitLink(GetConfiguredLinkMode());
+
+    // Display a progress dialog while the connection is establishing
+    if (state == LINK_NEEDS_UPDATE) {
+        wxProgressDialog pdlg(
+            title, connection_message, 100, this,
+            wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_ELAPSED_TIME);
+
+        while (state == LINK_NEEDS_UPDATE) {
+            // Ask the core for updates
+            std::array<char, kHostLength> message;
+            state = ConnectLinkUpdate(message.data(), kHostLength);
+            connection_message = wxString(message.data(), wxConvLibc);
+
+            // Does the user want to abort?
+            if (!pdlg.Pulse(connection_message)) {
+                state = LINK_ABORT;
+            }
+        }
+    }
+
+    // The user cancelled the connection attempt.
+    if (state == LINK_ABORT) {
+        CloseLink();
+    }
+
+    // Something failed during init.
+    if (state == LINK_ERROR) {
+        CloseLink();
+        wxLogError(_("Error occurred.\nPlease try again."));
+    }
+
+    if (GetLinkMode() != LINK_DISCONNECTED) {
+        connection_message.Replace("\n", " ");
+        systemScreenMessage(connection_message);
+        event.Skip();  // all OK
+    }
+}
+
+}  // namespace dialogs
+
+#endif  // !defined(NO_LINK)
diff --git a/src/wx/dialogs/net-link.h b/src/wx/dialogs/net-link.h
new file mode 100644
index 00000000..dcec5d25
--- /dev/null
+++ b/src/wx/dialogs/net-link.h
@@ -0,0 +1,47 @@
+#ifndef VBAM_WX_DIALOGS_NET_LINK_H_
+#define VBAM_WX_DIALOGS_NET_LINK_H_
+
+#if !defined(NO_LINK)
+
+#include <wx/dialog.h>
+
+#include "../gba/GBALink.h"
+#include "widgets/keep-on-top-styler.h"
+
+namespace dialogs {
+
+// Helper function to get the current LinkMode.
+LinkMode GetConfiguredLinkMode();
+
+// Manages the Network Link dialog.
+class NetLink : public wxDialog {
+public:
+    static NetLink* NewInstance(wxWindow* parent);
+    ~NetLink() override = default;
+
+private:
+    // The constructor is private so initialization has to be done via the
+    // static method. This is because this class is destroyed when its
+    // owner, `parent` is destroyed. This prevents accidental deletion.
+    NetLink(wxWindow* parent);
+
+    // Modifies the dialog when the server option is selected.
+    void OnServerSelected(wxCommandEvent& event);
+
+    // Modifies the dialog when the client option is selected.
+    void OnClientSelected(wxCommandEvent& event);
+
+    // Custom validation for this dialog.
+    void OnValidate(wxCommandEvent& event);
+
+    wxWindow* server_panel_;
+    wxWindow* client_panel_;
+    wxWindow* ok_button_;
+    const widgets::KeepOnTopStyler keep_on_top_styler_;
+};
+
+}  // namespace dialogs
+
+#endif  // !defined(NO_LINK)
+
+#endif  // VBAM_WX_DIALOGS_NET_LINK_H_
diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp
index 394ba362..43b8a468 100644
--- a/src/wx/guiinit.cpp
+++ b/src/wx/guiinit.cpp
@@ -34,6 +34,10 @@
 #include "opts.h"
 #include "widgets/option-validator.h"
 
+#ifndef NO_LINK
+#include "dialogs/net-link.h"
+#endif
+
 #if defined(__WXGTK__)
 #include "wayland.h"
 #endif
@@ -70,126 +74,6 @@ const
 
 // Event handlers must be methods of wxEvtHandler-derived objects
 
-// manage the network link dialog
-#ifndef NO_LINK
-static class NetLink_t : public wxEvtHandler {
-public:
-    wxDialog* dlg;
-    int n_players;
-    bool server;
-    NetLink_t()
-        : n_players(2)
-        , server(false)
-    {
-    }
-    wxButton* okb;
-    void ServerOKButton(wxCommandEvent& ev)
-    {
-        (void)ev; // unused params
-        okb->SetLabel(_("Start!"));
-    }
-    void BindServerIP(wxCommandEvent& ev)
-    {
-        (void)ev; // unused param
-        auto *tc = XRCCTRL(*dlg, "ServerIP", wxTextCtrl);
-        tc->SetValidator(wxTextValidator(wxFILTER_NONE, &gopts.server_ip));
-        tc->SetValue(gopts.server_ip);
-    }
-    void BindLinkHost(wxCommandEvent& ev)
-    {
-        (void)ev; // unused param
-        auto *tc = XRCCTRL(*dlg, "ServerIP", wxTextCtrl);
-        tc->SetValidator(wxTextValidator(wxFILTER_NONE, &gopts.link_host));
-        tc->SetValue(gopts.link_host);
-    }
-    void ClientOKButton(wxCommandEvent& ev)
-    {
-        (void)ev; // unused params
-        okb->SetLabel(_("Connect"));
-    }
-    // attached to OK, so skip when OK
-    void NetConnect(wxCommandEvent& ev)
-    {
-        static const int length = 256;
-
-        if (!dlg->Validate() || !dlg->TransferDataFromWindow())
-            return;
-
-        IP_LINK_PORT         = gopts.link_port;
-        IP_LINK_BIND_ADDRESS = gopts.server_ip;
-
-        if (!server) {
-            bool valid = SetLinkServerHost(gopts.link_host.utf8_str());
-
-            if (!valid) {
-                wxMessageBox(_("You must enter a valid host name"),
-                    _("Host name invalid"), wxICON_ERROR | wxOK);
-                return;
-            }
-        }
-
-        gopts.link_num_players = n_players;
-        update_opts(); // save fast flag and client host
-        // Close any previous link
-        CloseLink();
-        wxString connmsg;
-        wxString title;
-        SetLinkTimeout(gopts.link_timeout);
-        EnableSpeedHacks(OPTION(kGBALinkFast));
-        EnableLinkServer(server, gopts.link_num_players - 1);
-
-        if (server) {
-            char host[length];
-            GetLinkServerHost(host, length);
-            title.Printf(_("Waiting for clients..."));
-            connmsg.Printf(_("Server IP address is: %s\n"), wxString(host, wxConvLibc).c_str());
-        } else {
-            title.Printf(_("Waiting for connection..."));
-            connmsg.Printf(_("Connecting to %s\n"), gopts.link_host.c_str());
-        }
-
-        // Init link
-        MainFrame* mf = wxGetApp().frame;
-        ConnectionState state = InitLink(mf->GetConfiguredLinkMode());
-
-        // Display a progress dialog while the connection is establishing
-        if (state == LINK_NEEDS_UPDATE) {
-            wxProgressDialog pdlg(title, connmsg,
-                100, dlg, wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_ELAPSED_TIME);
-
-            while (state == LINK_NEEDS_UPDATE) {
-                // Ask the core for updates
-                char message[length];
-                state = ConnectLinkUpdate(message, length);
-                connmsg = wxString(message, wxConvLibc);
-
-                // Does the user want to abort?
-                if (!pdlg.Pulse(connmsg)) {
-                    state = LINK_ABORT;
-                }
-            }
-        }
-
-        // The user canceled the connection attempt
-        if (state == LINK_ABORT) {
-            CloseLink();
-        }
-
-        // Something failed during init
-        if (state == LINK_ERROR) {
-            CloseLink();
-            wxLogError(_("Error occurred.\nPlease try again."));
-        }
-
-        if (GetLinkMode() != LINK_DISCONNECTED) {
-            connmsg.Replace(wxT("\n"), wxT(" "));
-            systemScreenMessage(connmsg);
-            ev.Skip(); // all OK
-        }
-    }
-} net_link_handler;
-#endif
-
 // manage the cheat list dialog
 static class CheatList_t : public wxEvtHandler {
 public:
@@ -2528,7 +2412,7 @@ bool MainFrame::BindControls()
 #endif
 #ifdef NO_LINK
 
-            if (cmdtab[i].cmd_id == XRCID("LanLink") || cmdtab[i].cmd_id == XRCID("LinkType0Nothing") || cmdtab[i].cmd_id == XRCID("LinkType1Cable") || cmdtab[i].cmd_id == XRCID("LinkType2Wireless") || cmdtab[i].cmd_id == XRCID("LinkType3GameCube") || cmdtab[i].cmd_id == XRCID("LinkType4Gameboy") || cmdtab[i].cmd_id == XRCID("LinkAuto") || cmdtab[i].cmd_id == XRCID("SpeedOn") || cmdtab[i].cmd_id == XRCID("LinkProto") || cmdtab[i].cmd_id == XRCID("LinkConfigure")) {
+            if (cmdtab[i].cmd_id == XRCID("LanLink") || cmdtab[i].cmd_id == XRCID("LinkType0Nothing") || cmdtab[i].cmd_id == XRCID("LinkType1Cable") || cmdtab[i].cmd_id == XRCID("LinkType2Wireless") || cmdtab[i].cmd_id == XRCID("LinkType3GameCube") || cmdtab[i].cmd_id == XRCID("LinkType4Gameboy") || cmdtab[i].cmd_id == XRCID("LinkAuto") || cmdtab[i].cmd_id == XRCID("SpeedOn") || cmdtab[i].cmd_id == XRCID("LinkProto")) {
                 if (mi)
                     mi->GetMenu()->Remove(mi);
 
@@ -2819,7 +2703,7 @@ bool MainFrame::BindControls()
         d->Fit();
 //// Emulation menu
 #ifndef NO_LINK
-        d = LoadXRCDialog("NetLink");
+        dialogs::NetLink::NewInstance(this);
 #endif
         wxRadioButton* rb;
 #define getrbo(name, option_id, value)                            \
@@ -2833,109 +2717,12 @@ bool MainFrame::BindControls()
         rb = SafeXRCCTRL<wxRadioButton>(d, n);       \
         rb->SetValidator(wxBoolIntValidator(&o, v)); \
     } while (0)
-        wxBoolEnValidator* benval;
-        wxBoolEnHandler* ben;
-#define getbe(n, o, cv, t, wt)                                        \
-    do {                                                              \
-        cv = SafeXRCCTRL<t>(d, n);                                    \
-        cv->SetValidator(wxBoolEnValidator(&o));                      \
-        benval = wxStaticCast(cv->GetValidator(), wxBoolEnValidator); \
-        static wxBoolEnHandler _ben;                                  \
-        ben = &_ben;                                                  \
-        wx##wt##BoolEnHandlerConnect(cv, wxID_ANY, _ben);             \
-    } while (0)
-        // brenval & friends are here just to allow yes/no radioboxes in place
-        // of checkboxes.  A lot of work for little benefit.
-        wxBoolRevEnValidator* brenval;
-#define getbre(n, o, cv, t, wt)                                           \
-    do {                                                                  \
-        cv = SafeXRCCTRL<t>(d, n);                                        \
-        cv->SetValidator(wxBoolRevEnValidator(&o));                       \
-        brenval = wxStaticCast(cv->GetValidator(), wxBoolRevEnValidator); \
-        wx##wt##BoolEnHandlerConnect(rb, wxID_ANY, *ben);                 \
-    } while (0)
-#define addbe(n)                       \
-    do {                               \
-        ben->controls.push_back(n);    \
-        benval->controls.push_back(n); \
-    } while (0)
-#define addrbe(n)                       \
-    do {                                \
-        addbe(n);                       \
-        brenval->controls.push_back(n); \
-    } while (0)
-#define addber(n, r)                   \
-    do {                               \
-        ben->controls.push_back(n);    \
-        ben->reverse.push_back(r);     \
-        benval->controls.push_back(n); \
-        benval->reverse.push_back(r);  \
-    } while (0)
-#define addrber(n, r)                   \
-    do {                                \
-        addber(n, r);                   \
-        brenval->controls.push_back(n); \
-        brenval->reverse.push_back(r);  \
-    } while (0)
-#define getrbbe(n, o) getbe(n, o, rb, wxRadioButton, RBE)
-#define getrbbd(n, o) getbre(n, o, rb, wxRadioButton, RBD)
         wxTextCtrl* tc;
 #define gettc(n, o)                                           \
     do {                                                      \
         tc = SafeXRCCTRL<wxTextCtrl>(d, n);                   \
         tc->SetValidator(wxTextValidator(wxFILTER_NONE, &o)); \
     } while (0)
-#define getutc(n, o)                                          \
-    do {                                                      \
-        tc = SafeXRCCTRL<wxTextCtrl>(d, n);                   \
-        tc->SetValidator(wxUIntValidator(&o));                \
-    } while (0)
-#ifndef NO_LINK
-        {
-            net_link_handler.dlg = d;
-            net_link_handler.n_players = gopts.link_num_players;
-            getrbbe("Server", net_link_handler.server);
-            getrbbd("Client", net_link_handler.server);
-            getlab("PlayersLab");
-            addrber(lab, false);
-            getrbi("Link2P", net_link_handler.n_players, 2);
-            addrber(rb, false);
-            getrbi("Link3P", net_link_handler.n_players, 3);
-            addrber(rb, false);
-            getrbi("Link4P", net_link_handler.n_players, 4);
-            addrber(rb, false);
-            getlab("ServerIPLab");
-            gettc("ServerIP", gopts.link_host);
-            getutc("ServerPort", gopts.link_port);
-            wxWindow* okb = d->FindWindow(wxID_OK);
-
-            if (okb) // may be gone if style guidlines removed it
-            {
-                net_link_handler.okb = wxStaticCast(okb, wxButton);
-                d->Connect(XRCID("Server"), wxEVT_COMMAND_RADIOBUTTON_SELECTED,
-                    wxCommandEventHandler(NetLink_t::ServerOKButton),
-                    NULL, &net_link_handler);
-                d->Connect(XRCID("Client"), wxEVT_COMMAND_RADIOBUTTON_SELECTED,
-                    wxCommandEventHandler(NetLink_t::ClientOKButton),
-                    NULL, &net_link_handler);
-            }
-
-            // Bind server IP when the server radio button is selected.
-            d->Connect(XRCID("Server"), wxEVT_COMMAND_RADIOBUTTON_SELECTED,
-                wxCommandEventHandler(NetLink_t::BindServerIP),
-                NULL, &net_link_handler);
-            // Bind client link_host when client radio button is selected.
-            d->Connect(XRCID("Client"), wxEVT_COMMAND_RADIOBUTTON_SELECTED,
-                wxCommandEventHandler(NetLink_t::BindLinkHost),
-                NULL, &net_link_handler);
-
-            // this should intercept wxID_OK before the dialog handler gets it
-            d->Connect(wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED,
-                wxCommandEventHandler(NetLink_t::NetConnect),
-                NULL, &net_link_handler);
-            d->Fit();
-        }
-#endif
         d = LoadXRCDialog("CheatList");
         {
             cheat_list_handler.dlg = d;
@@ -3363,16 +3150,6 @@ bool MainFrame::BindControls()
             joyDialog->Fit();
         }
 
-#ifndef NO_LINK
-        d = LoadXRCDialog("LinkConfig");
-        {
-            getlab("LinkTimeoutLab");
-            addbe(lab);
-            getsc("LinkTimeout", gopts.link_timeout);
-            addbe(sc);
-            d->Fit();
-        }
-#endif
         d = LoadXRCDialog("AccelConfig");
         {
             wxTreeCtrl* tc;
@@ -3504,36 +3281,31 @@ bool MainFrame::BindControls()
     }
 
 #ifndef NO_LINK
-    LinkMode link_mode = GetConfiguredLinkMode();
-
+    LinkMode link_mode = dialogs::GetConfiguredLinkMode();
     if (link_mode == LINK_GAMECUBE_DOLPHIN) {
-        bool isv = !gopts.link_host.empty();
-
-        if (isv) {
-            isv = SetLinkServerHost(gopts.link_host.utf8_str());
-        }
-
-        if (!isv) {
+        const wxString& link_host = OPTION(kGBALinkHost).Get();
+        if (link_host.empty()) {
             wxLogError(_("JoyBus host invalid; disabling"));
         } else {
+            if (SetLinkServerHost(link_host.utf8_str())) {
             link_mode = LINK_DISCONNECTED;
+            }
         }
     }
 
-    ConnectionState linkState = InitLink(link_mode);
-
-    if (linkState != LINK_OK) {
+    if (InitLink(link_mode) != LINK_OK) {
         CloseLink();
     }
 
     if (GetLinkMode() != LINK_DISCONNECTED) {
         cmd_enable |= CMDEN_LINK_ANY;
-        SetLinkTimeout(gopts.link_timeout);
+        SetLinkTimeout(OPTION(kGBALinkTimeout));
         EnableSpeedHacks(OPTION(kGBALinkFast));
     }
 
     EnableNetworkMenu();
 #endif
+
     enable_menus();
     panel->SetFrameTitle();
     // All OK; activate idle loop
diff --git a/src/wx/opts.h b/src/wx/opts.h
index 0ea05fec..aa78250a 100644
--- a/src/wx/opts.h
+++ b/src/wx/opts.h
@@ -27,11 +27,6 @@ extern struct opts_t {
 
     /// GBA
     wxString gba_bios;
-    // quick fix for issues #48 and #445
-    wxString link_host = "127.0.0.1";
-    wxString server_ip = "*";
-    uint32_t link_port = 5738;
-    int link_timeout = 500;
     int gba_link_type;
 
     /// General
@@ -48,7 +43,6 @@ extern struct opts_t {
 
     /// Core
     int gdb_port = 55555;
-    int link_num_players = 2;
     int max_scale = 0;
 
     /// Sound
diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
index 14752313..25ca7188 100644
--- a/src/wx/panel.cpp
+++ b/src/wx/panel.cpp
@@ -32,6 +32,7 @@
 #include "config/option-proxy.h"
 #include "config/option.h"
 #include "config/user-input.h"
+#include "dialogs/net-link.h"
 #include "drawing.h"
 #include "filters.h"
 #include "wayland.h"
@@ -523,9 +524,9 @@ void GameArea::LoadGame(const wxString& name)
 
 #ifndef NO_LINK
     if (OPTION(kGBALinkAuto)) {
-        BootLink(mf->GetConfiguredLinkMode(), UTF8(gopts.link_host),
-                 gopts.link_timeout, OPTION(kGBALinkFast),
-                 gopts.link_num_players);
+        BootLink(dialogs::GetConfiguredLinkMode(), UTF8(OPTION(kGBALinkHost)),
+                 OPTION(kGBALinkTimeout), OPTION(kGBALinkFast),
+                 OPTION(kPrefLinkNumPlayers));
     }
 #endif
 
diff --git a/src/wx/widgets/option-validator.cpp b/src/wx/widgets/option-validator.cpp
index f43a4b92..3be897b2 100644
--- a/src/wx/widgets/option-validator.cpp
+++ b/src/wx/widgets/option-validator.cpp
@@ -4,6 +4,7 @@
 #include <wx/choice.h>
 #include <wx/radiobut.h>
 #include <wx/spinctrl.h>
+#include <wx/textctrl.h>
 
 namespace widgets {
 
@@ -142,4 +143,63 @@ bool OptionChoiceValidator::WriteToOption() {
     return option()->SetUnsigned(choice->GetSelection());
 }
 
+OptionIntValidator::OptionIntValidator(config::OptionID option_id,
+                                       int32_t value)
+    : OptionValidator(option_id), value_(value) {
+    assert(option()->is_int());
+    assert(option()->GetIntMin() <= value_);
+    assert(option()->GetIntMax() >= value_);
+}
+
+wxObject* OptionIntValidator::Clone() const {
+    return new OptionIntValidator(option()->id(), value_);
+}
+
+bool OptionIntValidator::IsWindowValueValid() {
+    return true;
+}
+
+bool OptionIntValidator::WriteToWindow() {
+    wxRadioButton* radio_button = wxDynamicCast(GetWindow(), wxRadioButton);
+    assert(radio_button);
+    radio_button->SetValue(option()->GetInt() == value_);
+    return true;
+}
+
+bool OptionIntValidator::WriteToOption() {
+    const wxRadioButton* radio_button =
+        wxDynamicCast(GetWindow(), wxRadioButton);
+    assert(radio_button);
+    if (radio_button->GetValue()) {
+        option()->SetInt(value_);
+    }
+    return true;
+}
+
+OptionStringValidator::OptionStringValidator(config::OptionID option_id)
+    : OptionValidator(option_id) {
+    assert(option()->is_string());
+}
+
+wxObject* OptionStringValidator::Clone() const {
+    return new OptionStringValidator(option()->id());
+}
+
+bool OptionStringValidator::IsWindowValueValid() {
+    return true;
+}
+
+bool OptionStringValidator::WriteToWindow() {
+    wxTextCtrl* text_control = wxDynamicCast(GetWindow(), wxTextCtrl);
+    assert(text_control);
+    text_control->SetValue(option()->GetString());
+    return true;
+}
+
+bool OptionStringValidator::WriteToOption() {
+    const wxTextCtrl* text_control = wxDynamicCast(GetWindow(), wxTextCtrl);
+    assert(text_control);
+    return option()->SetString(text_control->GetValue());
+}
+
 }  // namespace widgets
diff --git a/src/wx/widgets/option-validator.h b/src/wx/widgets/option-validator.h
index ed2fab2f..97c1e0f1 100644
--- a/src/wx/widgets/option-validator.h
+++ b/src/wx/widgets/option-validator.h
@@ -140,6 +140,42 @@ private:
     bool WriteToOption() override;
 };
 
+// Validator for a wxRadioButton widget with a selected kInt Option. This will
+// keep the kInt Option and the wxRadioButton selection in sync.
+class OptionIntValidator : public OptionValidator {
+public:
+    explicit OptionIntValidator(config::OptionID option_id, int32_t value);
+    ~OptionIntValidator() override = default;
+
+    // Returns a copy of the object.
+    wxObject* Clone() const override;
+
+private:
+    // OptionValidator implementation.
+    bool IsWindowValueValid() override;
+    bool WriteToWindow() override;
+    bool WriteToOption() override;
+
+    const int32_t value_;
+};
+
+// Validator for a wxTextCtrl widget with a selected kString Option. This will
+// keep the kString Option and the wxTextCtrl in sync.
+class OptionStringValidator : public OptionValidator {
+public:
+    explicit OptionStringValidator(config::OptionID option_id);
+    ~OptionStringValidator() override = default;
+
+    // Returns a copy of the object.
+    wxObject* Clone() const override;
+
+private:
+    // OptionValidator implementation.
+    bool IsWindowValueValid() override;
+    bool WriteToWindow() override;
+    bool WriteToOption() override;
+};
+
 }  // namespace widgets
 
 #endif  // VBAM_WX_WIDGETS_OPTION_VALIDATOR_H_
diff --git a/src/wx/widgets/wx/wxmisc.h b/src/wx/widgets/wx/wxmisc.h
index 70e3d4c1..974a03ca 100644
--- a/src/wx/widgets/wx/wxmisc.h
+++ b/src/wx/widgets/wx/wxmisc.h
@@ -52,36 +52,6 @@ protected:
     uint32_t* uint_val;
 };
 
-// boolean copy-only validator with reversed value
-// may be attached to radio button or checkbox
-class wxBoolRevValidator : public wxValidator {
-public:
-    wxBoolRevValidator(bool* _vptr)
-        : wxValidator()
-        , vptr(_vptr)
-    {
-    }
-    wxBoolRevValidator(const wxBoolRevValidator& v)
-        : wxValidator()
-        , vptr(v.vptr)
-    {
-    }
-    wxObject* Clone() const
-    {
-        return new wxBoolRevValidator(vptr);
-    }
-    bool TransferToWindow();
-    bool TransferFromWindow();
-    bool Validate(wxWindow* p)
-    {
-        (void)p; // unused params
-        return true;
-    }
-
-protected:
-    bool* vptr;
-};
-
 // wxFilePickerCtrl/wxDirPickerCtrl copy-only vvalidator
 class wxFileDirPickerValidator : public wxValidator {
 public:
@@ -114,139 +84,6 @@ protected:
     wxStaticText* vlabel;
 };
 
-// Copy-only validators for checkboxes and radio buttons that enables a set
-// of dependent widgets
-// Requires an event handler during run-time
-
-// there's probably a standard wxWindowList or some such, but it's
-// undocumented and I prefer arrays
-typedef std::vector<wxWindow*> wxWindow_v;
-
-class wxBoolEnValidator : public wxGenericValidator {
-public:
-    wxBoolEnValidator(bool* vptr)
-        : wxGenericValidator(vptr)
-    {
-    }
-    wxBoolEnValidator(bool* vptr, wxWindow_v& cnt, std::vector<int> rev = std::vector<int>())
-        : wxGenericValidator(vptr)
-        , controls(cnt)
-        , reverse(rev)
-    {
-    }
-    wxBoolEnValidator(const wxBoolEnValidator& v)
-        : wxGenericValidator(v)
-        , controls(v.controls)
-        , reverse(v.reverse)
-    {
-    }
-    wxObject* Clone() const
-    {
-        return new wxBoolEnValidator(*this);
-    }
-    // set these after init, rather than in constructor
-    wxWindow_v controls;
-    // set reverse entries to true if disabled when checkbox checked
-    // controls past the end of the reverse array are not reversed
-    std::vector<int> reverse;
-    // inherit validate, xferfrom from parent
-    bool TransferToWindow();
-};
-
-class wxBoolIntEnValidator : public wxBoolIntValidator {
-public:
-    wxBoolIntEnValidator(int* vptr, int val, int mask = ~0)
-        : wxBoolIntValidator(vptr, val, mask)
-    {
-    }
-    wxBoolIntEnValidator(int* vptr, int val, int mask, wxWindow_v& cnt,
-        std::vector<int> rev = std::vector<int>())
-        : wxBoolIntValidator(vptr, val, mask)
-        , controls(cnt)
-        , reverse(rev)
-    {
-    }
-    wxBoolIntEnValidator(const wxBoolIntEnValidator& v)
-        : wxBoolIntValidator(v)
-        , controls(v.controls)
-        , reverse(v.reverse)
-    {
-    }
-    wxObject* Clone() const
-    {
-        return new wxBoolIntEnValidator(*this);
-    }
-    // set these after init, rather than in constructor
-    wxWindow_v controls;
-    // set reverse entries to true if disabled when checkbox checked
-    // controls past the end of the reverse array are not reversed
-    std::vector<int> reverse;
-    // inherit validate, xferfrom from parent
-    bool TransferToWindow();
-};
-
-class wxBoolRevEnValidator : public wxBoolRevValidator {
-public:
-    wxBoolRevEnValidator(bool* vptr)
-        : wxBoolRevValidator(vptr)
-    {
-    }
-    wxBoolRevEnValidator(bool* vptr, wxWindow_v& cnt, std::vector<int> rev = std::vector<int>())
-        : wxBoolRevValidator(vptr)
-        , controls(cnt)
-        , reverse(rev)
-    {
-    }
-    wxBoolRevEnValidator(const wxBoolRevEnValidator& v)
-        : wxBoolRevValidator(v)
-        , controls(v.controls)
-        , reverse(v.reverse)
-    {
-    }
-    wxObject* Clone() const
-    {
-        return new wxBoolRevEnValidator(*this);
-    }
-    // set these after init, rather than in constructor
-    wxWindow_v controls;
-    // set reverse entries to true if disabled when checkbox checked
-    // controls past the end of the reverse array are not reversed
-    std::vector<int> reverse;
-    // inherit validate, xferfrom from parent
-    bool TransferToWindow();
-};
-
-// and here's an event handler that can be attached to the widget or a parent
-// of the widget
-// It is a descendent of wxEvtHandler so its methods can be used as
-// event handlers
-class wxBoolEnHandler : public wxEvtHandler {
-public:
-    wxWindow_v controls;
-    std::vector<int> reverse;
-    void ToggleCheck(wxCommandEvent& ev);
-    void Enable(wxCommandEvent& ev);
-    void Disable(wxCommandEvent& ev);
-};
-
-// use this to connect to the handler of id in win to obj
-#define wxCBBoolEnHandlerConnect(win, id, obj)               \
-    (win)->Connect(id,                                       \
-        wxEVT_COMMAND_CHECKBOX_CLICKED,                      \
-        wxCommandEventHandler(wxBoolEnHandler::ToggleCheck), \
-        NULL,                                                \
-        &obj)
-
-#define wxRBBoolEnHandlerConnect(win, id, obj, f)  \
-    (win)->Connect(id,                             \
-        wxEVT_COMMAND_RADIOBUTTON_SELECTED,        \
-        wxCommandEventHandler(wxBoolEnHandler::f), \
-        NULL,                                      \
-        &obj)
-
-#define wxRBEBoolEnHandlerConnect(win, id, obj) wxRBBoolEnHandlerConnect(win, id, obj, Enable)
-#define wxRBDBoolEnHandlerConnect(win, id, obj) wxRBBoolEnHandlerConnect(win, id, obj, Disable)
-
 // for wxTextValidator include lists
 extern const wxArrayString val_hexdigits, val_sigdigits, val_unsdigits;
 
diff --git a/src/wx/widgets/wxmisc.cpp b/src/wx/widgets/wxmisc.cpp
index 2827fc44..97b1fd0a 100644
--- a/src/wx/widgets/wxmisc.cpp
+++ b/src/wx/widgets/wxmisc.cpp
@@ -1,12 +1,15 @@
 // utility widgets
+#include "wx/wxmisc.h"
 
 #include <cctype>
 #include <string>
 #include <algorithm>
 
-#include "wx/wxmisc.h"
-#include <wx/wx.h>
+#include <wx/checkbox.h>
+#include <wx/filepicker.h>
+#include <wx/radiobut.h>
 #include <wx/spinctrl.h>
+#include <wx/textctrl.h>
 
 bool wxBoolIntValidator::TransferToWindow()
 {
@@ -57,51 +60,6 @@ bool wxBoolIntValidator::TransferFromWindow()
     return true;
 }
 
-bool wxBoolRevValidator::TransferToWindow()
-{
-    if (!vptr)
-        return false;
-
-    wxCheckBox* cb = wxDynamicCast(GetWindow(), wxCheckBox);
-
-    if (cb) {
-        cb->SetValue(!*vptr);
-        return true;
-    }
-
-    wxRadioButton* rb = wxDynamicCast(GetWindow(), wxRadioButton);
-
-    if (rb) {
-        rb->SetValue(!*vptr);
-        return true;
-    }
-
-    return false;
-}
-
-bool wxBoolRevValidator::TransferFromWindow()
-{
-    if (!vptr)
-        return false;
-
-    wxCheckBox* cb = wxDynamicCast(GetWindow(), wxCheckBox);
-
-    if (cb)
-        *vptr = !cb->GetValue();
-    else {
-        wxRadioButton* rb = wxDynamicCast(GetWindow(), wxRadioButton);
-
-        if (rb)
-            *vptr = !rb->GetValue();
-        else
-            return false;
-    }
-
-    return true;
-}
-
-#include <wx/filepicker.h>
-
 bool wxFileDirPickerValidator::TransferToWindow()
 {
     if (!vptr)
@@ -148,70 +106,6 @@ bool wxFileDirPickerValidator::TransferFromWindow()
     return false;
 }
 
-static void enable(wxWindow_v controls, std::vector<int> reverse, bool en)
-{
-    for (size_t i = 0; i < controls.size(); i++)
-        controls[i]->Enable(reverse.size() <= i || !reverse[i] ? en : !en);
-}
-
-#define boolen(r)                                                          \
-    do {                                                                   \
-        int en;                                                            \
-        wxCheckBox* cb = wxDynamicCast(GetWindow(), wxCheckBox);           \
-        if (cb)                                                            \
-            en = cb->GetValue();                                           \
-        else {                                                             \
-            wxRadioButton* rb = wxDynamicCast(GetWindow(), wxRadioButton); \
-            if (!rb)                                                       \
-                return false;                                              \
-            en = rb->GetValue();                                           \
-        }                                                                  \
-        enable(controls, reverse, r ? !en : en);                           \
-        return true;                                                       \
-    } while (0)
-
-bool wxBoolEnValidator::TransferToWindow()
-{
-    if (!wxGenericValidator::TransferToWindow())
-        return false;
-
-    boolen(false);
-}
-
-bool wxBoolIntEnValidator::TransferToWindow()
-{
-    if (!wxBoolIntValidator::TransferToWindow())
-        return false;
-
-    boolen(false);
-}
-
-bool wxBoolRevEnValidator::TransferToWindow()
-{
-    if (!wxBoolRevValidator::TransferToWindow())
-        return false;
-
-    boolen(true);
-}
-
-void wxBoolEnHandler::ToggleCheck(wxCommandEvent& ev)
-{
-    enable(controls, reverse, ev.IsChecked());
-    ev.Skip();
-}
-
-void wxBoolEnHandler::Enable(wxCommandEvent& ev)
-{
-    enable(controls, reverse, true);
-    ev.Skip();
-}
-
-void wxBoolEnHandler::Disable(wxCommandEvent& ev)
-{
-    enable(controls, reverse, false);
-    ev.Skip();
-}
-
 static const wxString  val_hexdigits_s[] = {
     wxT("0"), wxT("1"), wxT("2"), wxT("3"), wxT("4"), wxT("5"), wxT("6"),
     wxT("7"), wxT("8"), wxT("9"), wxT("A"), wxT("B"), wxT("C"), wxT("D"),
diff --git a/src/wx/wxvbam.cpp b/src/wx/wxvbam.cpp
index 504d1ba0..f692db95 100644
--- a/src/wx/wxvbam.cpp
+++ b/src/wx/wxvbam.cpp
@@ -1212,49 +1212,6 @@ void MainFrame::StopModal()
         panel->Resume();
 }
 
-LinkMode MainFrame::GetConfiguredLinkMode()
-{
-    switch (gopts.gba_link_type) {
-    case 0:
-        return LINK_DISCONNECTED;
-        break;
-
-    case 1:
-        if (OPTION(kGBALinkProto))
-                return LINK_CABLE_IPC;
-        else
-            return LINK_CABLE_SOCKET;
-
-        break;
-
-    case 2:
-        if (OPTION(kGBALinkProto))
-            return LINK_RFU_IPC;
-        else
-            return LINK_RFU_SOCKET;
-
-        break;
-
-    case 3:
-        return LINK_GAMECUBE_DOLPHIN;
-        break;
-
-    case 4:
-        if (OPTION(kGBALinkProto))
-            return LINK_GAMEBOY_IPC;
-        else
-            return LINK_GAMEBOY_SOCKET;
-
-        break;
-
-    default:
-        return LINK_DISCONNECTED;
-        break;
-    }
-
-    return LINK_DISCONNECTED;
-}
-
 void MainFrame::IdentifyRom()
 {
     if (!panel->rom_name.empty())
diff --git a/src/wx/wxvbam.h b/src/wx/wxvbam.h
index dfe7b2b3..b6f50fc9 100644
--- a/src/wx/wxvbam.h
+++ b/src/wx/wxvbam.h
@@ -280,9 +280,6 @@ public:
         return focused;
     }
 
-    // Returns the link mode to set according to the options
-    LinkMode GetConfiguredLinkMode();
-
     void IdentifyRom();
 
     // Start GDB listener
diff --git a/src/wx/xrc/LinkConfig.xrc b/src/wx/xrc/LinkConfig.xrc
deleted file mode 100644
index 3e7f9d01..00000000
--- a/src/wx/xrc/LinkConfig.xrc
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="LinkConfig">
-    <title>Link configuration</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxStaticText" name="LinkTimeoutLab">
-              <label>Link timeout (in milliseconds)</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxSpinCtrl" name="LinkTimeout">
-              <min>0</min>
-              <max>9999999</max>
-            </object>
-            <option>1</option>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_OK"/>
-          </object>
-          <object class="button">
-            <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-    </object>
-  </object>
-</resource>
diff --git a/src/wx/xrc/MainMenu.xrc b/src/wx/xrc/MainMenu.xrc
index 81724730..070568e9 100644
--- a/src/wx/xrc/MainMenu.xrc
+++ b/src/wx/xrc/MainMenu.xrc
@@ -306,9 +306,6 @@
           <label>_Speed hack</label>
           <checkable>1</checkable>
         </object>
-        <object class="wxMenuItem" name="LinkConfigure">
-          <label>_Configure...</label>
-        </object>
       </object>
       <object class="wxMenu">
         <label>_Video</label>
diff --git a/src/wx/xrc/NetLink.xrc b/src/wx/xrc/NetLink.xrc
index 9ea3c113..2b336677 100644
--- a/src/wx/xrc/NetLink.xrc
+++ b/src/wx/xrc/NetLink.xrc
@@ -5,106 +5,47 @@
     <object class="wxBoxSizer">
       <orient>wxVERTICAL</orient>
       <object class="sizeritem">
-        <object class="wxGridSizer">
+        <object class="wxFlexGridSizer">
+          <rows>2</rows>
+          <cols>2</cols>
           <object class="sizeritem">
-            <object class="wxRadioButton" name="Server">
-              <label>Server</label>
-              <style>wxRB_GROUP</style>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE</flag>
+            <flag>wxALL|wxALIGN_LEFT</flag>
             <border>5</border>
+            <object class="wxRadioButton" name="Server">
+              <style>wxRB_GROUP</style>
+              <label>Server</label>
+            </object>
           </object>
           <object class="sizeritem">
+            <flag>wxALL|wxALIGN_LEFT</flag>
+            <border>5</border>
             <object class="wxRadioButton" name="Client">
               <label>Client</label>
             </object>
-            <flag>wxALL|wxALIGN_CENTRE</flag>
-            <border>5</border>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxFlexGridSizer">
-          <object class="sizeritem">
-            <object class="wxStaticText" name="PlayersLab">
-              <label>Players:</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
           </object>
           <object class="sizeritem">
-            <object class="wxGridSizer">
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="Link2P">
-                  <label>2</label>
-                  <style>wxRB_GROUP</style>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="Link3P">
-                  <label>3</label>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="Link4P">
-                  <label>4</label>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE</flag>
-                <border>5</border>
-              </object>
-              <cols>3</cols>
-            </object>
             <flag>wxEXPAND</flag>
+            <border>5</border>
+            <object_ref name="NetLinkServerPanel" ref="NetLinkServerPanel" />
           </object>
           <object class="sizeritem">
-            <object class="wxStaticText" name="ServerIPLab">
-              <label>Server:</label>
-              <wrap>200</wrap>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="ServerIP"/>
-            <option>1</option>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="ServerPortLab">
-              <label>Port:</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="ServerPort"/>
-            <option>1</option>
-            <flag>wxALL|wxEXPAND</flag>
+            <flag>wxEXPAND</flag>
             <border>5</border>
+            <object_ref name="NetLinkClientPanel" ref="NetLinkClientPanel" />
           </object>
         </object>
-        <flag>wxEXPAND</flag>
       </object>
       <object class="sizeritem">
+        <flag>wxALIGN_RIGHT|wxALL</flag>
+        <border>5</border>
         <object class="wxStdDialogButtonSizer">
           <object class="button">
-            <object class="wxButton" name="wxID_OK">
-              <label>Connect</label>
-            </object>
+            <object class="wxButton" name="wxID_OK" />
           </object>
           <object class="button">
-            <object class="wxButton" name="wxID_CANCEL"/>
+            <object class="wxButton" name="wxID_CANCEL" />
           </object>
         </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
       </object>
     </object>
   </object>
diff --git a/src/wx/xrc/NetLinkClientPanel.xrc b/src/wx/xrc/NetLinkClientPanel.xrc
new file mode 100644
index 00000000..3e1cac13
--- /dev/null
+++ b/src/wx/xrc/NetLinkClientPanel.xrc
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxPanel" name="NetLinkClientPanel">
+    <object class="wxFlexGridSizer">
+      <rows>2</rows>
+      <cols>2</cols>
+      <object class="sizeritem">
+        <flag>wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL</flag>
+        <border>5</border>
+        <object class="wxStaticText" name="LinkHostLab">
+          <label>Server:</label>
+        </object>
+      </object>
+      <object class="sizeritem">
+        <flag>wxALIGN_LEFT|wxALL</flag>
+        <border>5</border>
+        <object class="wxTextCtrl" name="LinkHost"/>
+      </object>
+      <object class="sizeritem">
+        <flag>wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL</flag>
+        <border>5</border>
+        <object class="wxStaticText" name="LinkPortLab">
+          <label>Port:</label>
+        </object>
+      </object>
+      <object class="sizeritem">
+        <flag>wxALIGN_LEFT|wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <object class="wxSpinCtrl" name="LinkPort">
+          <min>0</min>
+          <max>65535</max>
+        </object>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/NetLinkServerPanel.xrc b/src/wx/xrc/NetLinkServerPanel.xrc
new file mode 100644
index 00000000..2ee72004
--- /dev/null
+++ b/src/wx/xrc/NetLinkServerPanel.xrc
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxPanel" name="NetLinkServerPanel">
+    <object class="wxFlexGridSizer">
+      <rows>4</rows>
+      <cols>2</cols>
+      <object class="sizeritem">
+        <flag>wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL</flag>
+          <border>5</border>
+          <object class="wxStaticText" name="PlayersLab">
+          <label>Players:</label>
+          </object>
+      </object>
+      <object class="sizeritem">
+          <flag>wxALIGN_LEFT|wxALL|wxEXPAND</flag>
+          <border>5</border>
+          <object class="wxBoxSizer">
+            <orient>wxHORIZONTAL</orient>
+            <object class="sizeritem">
+              <flag>wxALL|wxALIGN_CENTER</flag>
+              <border>5</border>
+              <object class="wxRadioButton" name="Link2P">
+                <style>wxRB_GROUP</style>
+                <label>2</label>
+              </object>
+            </object>
+            <object class="sizeritem">
+              <flag>wxALL|wxALIGN_CENTER</flag>
+              <border>5</border>
+              <object class="wxRadioButton" name="Link3P">
+                <label>3</label>
+              </object>
+            </object>
+            <object class="sizeritem">
+              <flag>wxALL|wxALIGN_CENTER</flag>
+              <border>5</border>
+              <object class="wxRadioButton" name="Link4P">
+                <label>4</label>
+              </object>
+            </object>
+          </object>
+        </object>
+        <object class="sizeritem">
+          <flag>wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL</flag>
+          <border>5</border>
+          <object class="wxStaticText" name="ServerIPLab">
+            <label>Server:</label>
+          </object>
+        </object>
+        <object class="sizeritem">
+          <flag>wxALIGN_LEFT|wxALL|wxEXPAND</flag>
+          <border>5</border>
+          <object class="wxTextCtrl" name="ServerIP" />
+        </object>
+        <object class="sizeritem">
+            <flag>wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL</flag>
+            <border>5</border>
+            <object class="wxStaticText" name="ServerPortLab">
+              <label>Port:</label>
+            </object>
+        </object>
+        <object class="sizeritem">
+          <flag>wxALIGN_LEFT|wxALL|wxEXPAND</flag>
+          <border>5</border>
+          <object class="wxSpinCtrl" name="ServerPort">
+            <min>0</min>
+            <max>65535</max>
+          </object>
+        </object>
+        <object class="sizeritem">
+          <flag>wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL</flag>
+          <border>5</border>
+          <object class="wxStaticText" name="LinkTimeoutLab">
+            <label>Timeout:</label>
+          </object>
+        </object>
+        <object class="sizeritem">
+          <flag>wxALIGN_LEFT|wxALL|wxEXPAND</flag>
+          <border>5</border>
+          <object class="wxSpinCtrl" name="LinkTimeout">
+            <style>wxSP_ARROW_KEYS</style>
+            <min>0</min>
+            <max>9999999</max>
+          </object>
+        </object>
+      </object>
+  </object>
+</resource>