diff --git a/po/wxvbam/wxvbam.pot b/po/wxvbam/wxvbam.pot
index dc11045e..174f94b7 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-02-05 14:20-0800\n"
+"POT-Creation-Date: 2023-02-06 14:51-0800\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"
@@ -17,55 +17,60 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: wxvbam.cpp:260
+#: wxvbam.cpp:265
 msgid "visualboyadvance-m"
 msgstr ""
 
-#: wxvbam.cpp:486
+#: wxvbam.cpp:329 wxvbam.cpp:346
+#, c-format
+msgid "Invalid configuration file provided: %s"
+msgstr ""
+
+#: wxvbam.cpp:484
 msgid "Could not create main window"
 msgstr ""
 
-#: wxvbam.cpp:557
+#: wxvbam.cpp:565
 msgid "Save built-in XRC file and exit"
 msgstr ""
 
-#: wxvbam.cpp:560
+#: wxvbam.cpp:568
 msgid "Save built-in vba-over.ini and exit"
 msgstr ""
 
-#: wxvbam.cpp:563
+#: wxvbam.cpp:571
 msgid "Print configuration path and exit"
 msgstr ""
 
-#: wxvbam.cpp:566
+#: wxvbam.cpp:574
 msgid "Start in full-screen mode"
 msgstr ""
 
-#: wxvbam.cpp:569
+#: wxvbam.cpp:577
 msgid "Set a configuration file"
 msgstr ""
 
-#: wxvbam.cpp:573
+#: wxvbam.cpp:581
 msgid "Delete shared link state first, if it exists"
 msgstr ""
 
-#: wxvbam.cpp:580
+#: wxvbam.cpp:588
 msgid "List all settable options and exit"
 msgstr ""
 
-#: wxvbam.cpp:583
+#: wxvbam.cpp:591
 msgid "ROM file"
 msgstr ""
 
-#: wxvbam.cpp:585
+#: wxvbam.cpp:593
 msgid "<config>=<value>"
 msgstr ""
 
-#: wxvbam.cpp:616
+#: wxvbam.cpp:624
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:624
+#: wxvbam.cpp:632
 #, c-format
 msgid ""
 "Wrote built-in configuration to %s.\n"
@@ -74,11 +79,11 @@ msgid ""
 "built-in:"
 msgstr ""
 
-#: wxvbam.cpp:638
+#: wxvbam.cpp:646
 msgid "Configuration is read from, in order:"
 msgstr ""
 
-#: wxvbam.cpp:652
+#: wxvbam.cpp:660
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
@@ -86,13 +91,13 @@ msgid ""
 "from search path:"
 msgstr ""
 
-#: wxvbam.cpp:658
+#: wxvbam.cpp:666
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr ""
 
-#: wxvbam.cpp:673
+#: wxvbam.cpp:681
 msgid ""
 "Options set from the command line are saved if any configuration changes are "
 "made in the user interface.\n"
@@ -101,313 +106,313 @@ msgid ""
 "\n"
 msgstr ""
 
-#: wxvbam.cpp:681
+#: wxvbam.cpp:689
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr ""
 
-#: wxvbam.cpp:692
+#: wxvbam.cpp:700
 msgid "Configuration file not found."
 msgstr ""
 
-#: wxvbam.cpp:725
+#: wxvbam.cpp:731
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr ""
 
-#: guiinit.cpp:85
+#: guiinit.cpp:86
 msgid "Start!"
 msgstr ""
 
-#: guiinit.cpp:104 xrc/NetLink.xrc:99
+#: guiinit.cpp:105 xrc/NetLink.xrc:99
 msgid "Connect"
 msgstr ""
 
-#: guiinit.cpp:121
+#: guiinit.cpp:122
 msgid "You must enter a valid host name"
 msgstr ""
 
-#: guiinit.cpp:122
+#: guiinit.cpp:123
 msgid "Host name invalid"
 msgstr ""
 
-#: guiinit.cpp:140
+#: guiinit.cpp:141
 msgid "Waiting for clients..."
 msgstr ""
 
-#: guiinit.cpp:141
+#: guiinit.cpp:142
 #, c-format
 msgid "Server IP address is: %s\n"
 msgstr ""
 
-#: guiinit.cpp:143
+#: guiinit.cpp:144
 msgid "Waiting for connection..."
 msgstr ""
 
-#: guiinit.cpp:144
+#: guiinit.cpp:145
 #, c-format
 msgid "Connecting to %s\n"
 msgstr ""
 
-#: guiinit.cpp:177
+#: guiinit.cpp:178
 msgid ""
 "Error occurred.\n"
 "Please try again."
 msgstr ""
 
-#: guiinit.cpp:244 guiinit.cpp:297
+#: guiinit.cpp:245 guiinit.cpp:298
 msgid "Select cheat file"
 msgstr ""
 
-#: guiinit.cpp:245
+#: guiinit.cpp:246
 msgid "VBA cheat lists (*.clt)|*.clt|CHT cheat lists (*.cht)|*.cht"
 msgstr ""
 
-#: guiinit.cpp:264 panel.cpp:508
+#: guiinit.cpp:265 panel.cpp:509
 msgid "Loaded cheats"
 msgstr ""
 
-#: guiinit.cpp:298
+#: guiinit.cpp:299
 msgid "VBA cheat lists (*.clt)|*.clt"
 msgstr ""
 
-#: guiinit.cpp:316
+#: guiinit.cpp:317
 msgid "Saved cheats"
 msgstr ""
 
-#: guiinit.cpp:347 guiinit.cpp:366
+#: guiinit.cpp:348 guiinit.cpp:367
 msgid "Restore old values?"
 msgstr ""
 
-#: guiinit.cpp:348 guiinit.cpp:367
+#: guiinit.cpp:349 guiinit.cpp:368
 msgid "Removing cheats"
 msgstr ""
 
-#: guiinit.cpp:758
+#: guiinit.cpp:759
 msgid "Game Shark"
 msgstr ""
 
-#: guiinit.cpp:759
+#: guiinit.cpp:760
 msgid "Game Genie"
 msgstr ""
 
-#: guiinit.cpp:761
+#: guiinit.cpp:762
 msgid "Generic Code"
 msgstr ""
 
-#: guiinit.cpp:762
+#: guiinit.cpp:763
 msgid "Game Shark Advance"
 msgstr ""
 
-#: guiinit.cpp:763
+#: guiinit.cpp:764
 msgid "Code Breaker Advance"
 msgstr ""
 
-#: guiinit.cpp:764
+#: guiinit.cpp:765
 msgid "Flashcart CHT"
 msgstr ""
 
-#: guiinit.cpp:832 guiinit.cpp:1087
+#: guiinit.cpp:833 guiinit.cpp:1088
 msgid "Number cannot be empty"
 msgstr ""
 
-#: guiinit.cpp:870
+#: guiinit.cpp:871
 #, c-format
 msgid "Search produced %d results.  Please refine better"
 msgstr ""
 
-#: guiinit.cpp:882
+#: guiinit.cpp:883
 msgid "Search produced no results"
 msgstr ""
 
-#: guiinit.cpp:1045
+#: guiinit.cpp:1046
 msgid "8-bit "
 msgstr ""
 
-#: guiinit.cpp:1049
+#: guiinit.cpp:1050
 msgid "16-bit "
 msgstr ""
 
-#: guiinit.cpp:1053
+#: guiinit.cpp:1054
 msgid "32-bit "
 msgstr ""
 
-#: guiinit.cpp:1059
+#: guiinit.cpp:1060
 msgid "signed decimal"
 msgstr ""
 
-#: guiinit.cpp:1063
+#: guiinit.cpp:1064
 msgid "unsigned decimal"
 msgstr ""
 
-#: guiinit.cpp:1067
+#: guiinit.cpp:1068
 msgid "unsigned hexadecimal"
 msgstr ""
 
-#: guiinit.cpp:1545
+#: guiinit.cpp:1546
 #, c-format
 msgid "%d frames = %.2f ms"
 msgstr ""
 
-#: guiinit.cpp:1557
+#: guiinit.cpp:1558
 msgid "Default device"
 msgstr ""
 
-#: guiinit.cpp:1727
+#: guiinit.cpp:1728
 msgid "Desktop mode"
 msgstr ""
 
-#: guiinit.cpp:1734
+#: guiinit.cpp:1735
 #, c-format
 msgid "%d x %d - %d bpp @ %d Hz"
 msgstr ""
 
-#: guiinit.cpp:1976
+#: guiinit.cpp:1977
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: guiinit.cpp:1976
+#: guiinit.cpp:1977
 msgid "Confirm"
 msgstr ""
 
-#: guiinit.cpp:2567
+#: guiinit.cpp:2568
 msgid "Main icon not found"
 msgstr ""
 
-#: guiinit.cpp:2577
+#: guiinit.cpp:2578
 msgid "Browse"
 msgstr ""
 
-#: guiinit.cpp:2591
+#: guiinit.cpp:2592
 msgid "Main display panel not found"
 msgstr ""
 
-#: guiinit.cpp:2757
+#: guiinit.cpp:2758
 #, c-format
 msgid "Duplicate menu accelerator: %s for %s and %s; keeping first"
 msgstr ""
 
-#: guiinit.cpp:2771
+#: guiinit.cpp:2772
 #, c-format
 msgid "Menu accelerator %s for %s overrides default for %s; keeping menu"
 msgstr ""
 
-#: guiinit.cpp:2910
+#: guiinit.cpp:2911
 #, c-format
 msgid "Invalid menu item %s; removing"
 msgstr ""
 
-#: guiinit.cpp:3113
+#: guiinit.cpp:3114
 msgid "Code"
 msgstr ""
 
-#: guiinit.cpp:3122
+#: guiinit.cpp:3123
 msgid "Description"
 msgstr ""
 
-#: guiinit.cpp:3196 xrc/CheatAdd.xrc:31
+#: guiinit.cpp:3197 xrc/CheatAdd.xrc:31
 msgid "Address"
 msgstr ""
 
-#: guiinit.cpp:3197
+#: guiinit.cpp:3198
 msgid "Old Value"
 msgstr ""
 
-#: guiinit.cpp:3198
+#: guiinit.cpp:3199
 msgid "New Value"
 msgstr ""
 
-#: guiinit.cpp:3670
+#: guiinit.cpp:3671
 msgid "Menu commands"
 msgstr ""
 
-#: guiinit.cpp:3693
+#: guiinit.cpp:3694
 msgid "Other commands"
 msgstr ""
 
-#: guiinit.cpp:3804
+#: guiinit.cpp:3805
 msgid "JoyBus host invalid; disabling"
 msgstr ""
 
-#: viewers.cpp:560
+#: viewers.cpp:561
 msgid "Text files (*.txt;*.log)|*.txt;*.log|"
 msgstr ""
 
-#: viewers.cpp:562 viewers.cpp:772 gfxviewers.cpp:1600 gfxviewers.cpp:1742
+#: viewers.cpp:563 viewers.cpp:773 gfxviewers.cpp:1600 gfxviewers.cpp:1742
 #: cmdevents.cpp:1185 cmdevents.cpp:1263 cmdevents.cpp:1333 cmdevents.cpp:1404
 #: viewsupt.cpp:1180
 msgid "Select output file"
 msgstr ""
 
-#: viewers.cpp:698 viewers.cpp:770
+#: viewers.cpp:699 viewers.cpp:771
 msgid "Memory dumps (*.dmp;*.bin)|*.dmp;*.bin|"
 msgstr ""
 
-#: viewers.cpp:700
+#: viewers.cpp:701
 msgid "Select memory dump file"
 msgstr ""
 
-#: viewers.cpp:814
+#: viewers.cpp:815
 msgid "0x00000000 - BIOS"
 msgstr ""
 
-#: viewers.cpp:815
+#: viewers.cpp:816
 msgid "0x02000000 - WRAM"
 msgstr ""
 
-#: viewers.cpp:816
+#: viewers.cpp:817
 msgid "0x03000000 - IRAM"
 msgstr ""
 
-#: viewers.cpp:817
+#: viewers.cpp:818
 msgid "0x04000000 - I / O"
 msgstr ""
 
-#: viewers.cpp:818
+#: viewers.cpp:819
 msgid "0x05000000 - PALETTE"
 msgstr ""
 
-#: viewers.cpp:819
+#: viewers.cpp:820
 msgid "0x06000000 - VRAM"
 msgstr ""
 
-#: viewers.cpp:820
+#: viewers.cpp:821
 msgid "0x07000000 - OAM"
 msgstr ""
 
-#: viewers.cpp:821
+#: viewers.cpp:822
 msgid "0x08000000 - ROM"
 msgstr ""
 
-#: viewers.cpp:924
+#: viewers.cpp:925
 msgid "0x0000 - ROM"
 msgstr ""
 
-#: viewers.cpp:925
+#: viewers.cpp:926
 msgid "0x4000 - ROM"
 msgstr ""
 
-#: viewers.cpp:926
+#: viewers.cpp:927
 msgid "0x8000 - VRAM"
 msgstr ""
 
-#: viewers.cpp:927
+#: viewers.cpp:928
 msgid "0xA000 - SRAM"
 msgstr ""
 
-#: viewers.cpp:928
+#: viewers.cpp:929
 msgid "0xC000 - RAM"
 msgstr ""
 
-#: viewers.cpp:929
+#: viewers.cpp:930
 msgid "0xD000 - WRAM"
 msgstr ""
 
-#: viewers.cpp:930
+#: viewers.cpp:931
 msgid "0xFF00 - I / O"
 msgstr ""
 
-#: viewers.cpp:931
+#: viewers.cpp:932
 msgid "0xFF80 - RAM"
 msgstr ""
 
@@ -573,7 +578,7 @@ msgstr ""
 msgid "ROM + HuC-1"
 msgstr ""
 
-#: cmdevents.cpp:773 dialogs/display-config.cpp:355 xrc/DisplayConfig.xrc:85
+#: cmdevents.cpp:773 dialogs/display-config.cpp:360 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
@@ -606,7 +611,7 @@ msgstr ""
 msgid "Confirm import"
 msgstr ""
 
-#: cmdevents.cpp:934 panel.cpp:451
+#: cmdevents.cpp:934 panel.cpp:452
 #, c-format
 msgid "Loaded battery %s"
 msgstr ""
@@ -689,7 +694,7 @@ msgstr ""
 msgid "Wrote battery %s"
 msgstr ""
 
-#: cmdevents.cpp:1127 panel.cpp:757
+#: cmdevents.cpp:1127 panel.cpp:758
 #, c-format
 msgid "Error writing battery %s"
 msgstr ""
@@ -716,7 +721,7 @@ msgstr ""
 msgid "Error saving snapshot file %s"
 msgstr ""
 
-#: cmdevents.cpp:1210 sys.cpp:558
+#: cmdevents.cpp:1210 sys.cpp:559
 #, c-format
 msgid "Wrote snapshot %s"
 msgstr ""
@@ -759,48 +764,59 @@ msgstr ""
 msgid "Volume: %d %%"
 msgstr ""
 
-#: cmdevents.cpp:2320
+#: cmdevents.cpp:2314
 msgid "Set to 0 for pseudo tty"
 msgstr ""
 
-#: cmdevents.cpp:2322
+#: cmdevents.cpp:2316
 msgid "Port to wait for connection:"
 msgstr ""
 
-#: cmdevents.cpp:2323
+#: cmdevents.cpp:2317
 msgid "GDB Connection"
 msgstr ""
 
-#: cmdevents.cpp:2376
+#: cmdevents.cpp:2370
 #, c-format
 msgid "Waiting for connection at %s"
 msgstr ""
 
-#: cmdevents.cpp:2383
+#: cmdevents.cpp:2377
 #, c-format
 msgid "Waiting for connection on port %d"
 msgstr ""
 
-#: cmdevents.cpp:2386
+#: cmdevents.cpp:2380
 msgid "Waiting for GDB..."
 msgstr ""
 
-#: cmdevents.cpp:2810 panel.cpp:251 panel.cpp:366
+#: cmdevents.cpp:2795 panel.cpp:252 panel.cpp:367
 msgid "Could not initialize the sound driver!"
 msgstr ""
 
-#: cmdevents.cpp:2914
+#: cmdevents.cpp:2861
+msgid ""
+"YOUR CONFIGURATION WILL BE DELETED!\n"
+"\n"
+"Are you sure?"
+msgstr ""
+
+#: cmdevents.cpp:2862
+msgid "FACTORY RESET"
+msgstr ""
+
+#: cmdevents.cpp:2897
 msgid "Nintendo Game Boy / Color / Advance) emulator."
 msgstr ""
 
-#: cmdevents.cpp:2915
+#: cmdevents.cpp:2898
 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:2917
+#: cmdevents.cpp:2900
 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"
@@ -816,15 +832,15 @@ msgid ""
 "along with this program. If not, see http://www.gnu.org/licenses ."
 msgstr ""
 
-#: cmdevents.cpp:3158
+#: cmdevents.cpp:3132
 msgid "Cannot use Game Boy BIOS when Colorizer Hack is enabled."
 msgstr ""
 
-#: cmdevents.cpp:3219
+#: cmdevents.cpp:3193
 msgid "LAN link is already active. Disable link mode to disconnect."
 msgstr ""
 
-#: cmdevents.cpp:3225
+#: cmdevents.cpp:3199
 msgid "Network is not supported in local mode."
 msgstr ""
 
@@ -856,267 +872,273 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: opts.cpp:518 opts.cpp:539 opts.cpp:745
+#: opts.cpp:354
+msgid ""
+"The INI file was written for a more recent version of VBA-M. Some INI option "
+"values may have been reset."
+msgstr ""
+
+#: opts.cpp:521 opts.cpp:542 opts.cpp:778
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr ""
 
-#: opts.cpp:668 opts.cpp:677 opts.cpp:686 opts.cpp:695 config/option.cpp:464
+#: opts.cpp:701 opts.cpp:710 opts.cpp:719 opts.cpp:728 config/option.cpp:464
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
 
-#: opts.cpp:767
+#: opts.cpp:800
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
 
-#: sys.cpp:196 sys.cpp:257
+#: sys.cpp:197 sys.cpp:258
 msgid "No game in progress to record"
 msgstr ""
 
-#: sys.cpp:214
+#: sys.cpp:215
 #, c-format
 msgid "Cannot open output file %s"
 msgstr ""
 
-#: sys.cpp:221 sys.cpp:241 sys.cpp:391
+#: sys.cpp:222 sys.cpp:242 sys.cpp:392
 msgid "Error writing game recording"
 msgstr ""
 
-#: sys.cpp:262
+#: sys.cpp:263
 msgid "Cannot play game recording while recording"
 msgstr ""
 
-#: sys.cpp:277
+#: sys.cpp:278
 #, c-format
 msgid "Cannot open recording file %s"
 msgstr ""
 
-#: sys.cpp:286 sys.cpp:296
+#: sys.cpp:287 sys.cpp:297
 msgid "Error reading game recording"
 msgstr ""
 
-#: sys.cpp:406 sys.cpp:425
+#: sys.cpp:407 sys.cpp:426
 msgid "Playback ended"
 msgstr ""
 
-#: sys.cpp:449
+#: sys.cpp:450
 #, c-format
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:457
+#: sys.cpp:458
 #, c-format
 msgid "%d %%"
 msgstr ""
 
-#: sys.cpp:879 xrc/GBPrinter.xrc:65
+#: sys.cpp:880 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr ""
 
-#: sys.cpp:913
+#: sys.cpp:914
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr ""
 
-#: sys.cpp:922
+#: sys.cpp:923
 msgid "Save printer image to"
 msgstr ""
 
-#: sys.cpp:936 sys.cpp:1119
+#: sys.cpp:937 sys.cpp:1120
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr ""
 
-#: sys.cpp:941 sys.cpp:1012
+#: sys.cpp:942 sys.cpp:1013
 msgid "&Close"
 msgstr ""
 
-#: sys.cpp:1007
+#: sys.cpp:1008
 msgid "Printed"
 msgstr ""
 
-#: sys.cpp:1309
+#: sys.cpp:1310
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr ""
 
-#: sys.cpp:1408
+#: sys.cpp:1409
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr ""
 
-#: panel.cpp:165
+#: panel.cpp:166
 #, c-format
 msgid "%s is not a valid ROM file"
 msgstr ""
 
-#: panel.cpp:166 panel.cpp:227 panel.cpp:304
+#: panel.cpp:167 panel.cpp:228 panel.cpp:305
 msgid "Problem loading file"
 msgstr ""
 
-#: panel.cpp:226
+#: panel.cpp:227
 #, c-format
 msgid "Unable to load Game Boy ROM %s"
 msgstr ""
 
-#: panel.cpp:263
+#: panel.cpp:264
 msgid ""
 "Cannot use Game Boy BIOS file when Colorizer Hack is enabled, disabling Game "
 "Boy BIOS file."
 msgstr ""
 
-#: panel.cpp:280 panel.cpp:380
+#: panel.cpp:281 panel.cpp:381
 #, c-format
 msgid "Could not load BIOS %s"
 msgstr ""
 
-#: panel.cpp:303
+#: panel.cpp:304
 #, c-format
 msgid "Unable to load Game Boy Advance ROM %s"
 msgstr ""
 
-#: panel.cpp:540
+#: panel.cpp:541
 msgid " player "
 msgstr ""
 
-#: panel.cpp:705
+#: panel.cpp:706
 #, c-format
 msgid "Loaded state %s"
 msgstr ""
 
-#: panel.cpp:705
+#: panel.cpp:706
 #, c-format
 msgid "Error loading state %s"
 msgstr ""
 
-#: panel.cpp:729
+#: panel.cpp:730
 #, c-format
 msgid "Saved state %s"
 msgstr ""
 
-#: panel.cpp:729
+#: panel.cpp:730
 #, c-format
 msgid "Error saving state %s"
 msgstr ""
 
-#: panel.cpp:933
+#: panel.cpp:934
 #, c-format
 msgid "Fullscreen mode %d x %d - %d @ %d not supported; looking for another"
 msgstr ""
 
-#: panel.cpp:971
+#: panel.cpp:972
 #, c-format
 msgid "Fullscreen mode %d x %d - %d @ %d not supported"
 msgstr ""
 
-#: panel.cpp:976
+#: panel.cpp:977
 #, c-format
 msgid "Valid mode: %d x %d - %d @ %d"
 msgstr ""
 
-#: panel.cpp:984
+#: panel.cpp:985
 #, c-format
 msgid "Chose mode %d x %d - %d @ %d"
 msgstr ""
 
-#: panel.cpp:988
+#: panel.cpp:989
 #, c-format
 msgid "Failed to change mode to %d x %d - %d @ %d"
 msgstr ""
 
-#: panel.cpp:1076
+#: panel.cpp:1077
 msgid "Not a valid Game Boy Advance cartridge"
 msgstr ""
 
-#: panel.cpp:1246
+#: panel.cpp:1244
 msgid "No memory for rewinding"
 msgstr ""
 
-#: panel.cpp:1256
+#: panel.cpp:1254
 msgid "Error writing rewind state"
 msgstr ""
 
-#: panel.cpp:2273
+#: panel.cpp:2272
 msgid "Enabling EGL VSync."
 msgstr ""
 
-#: panel.cpp:2275
+#: panel.cpp:2274
 msgid "Disabling EGL VSync."
 msgstr ""
 
-#: panel.cpp:2282
+#: panel.cpp:2281
 msgid "Enabling GLX VSync."
 msgstr ""
 
-#: panel.cpp:2284
+#: panel.cpp:2283
 msgid "Disabling GLX VSync."
 msgstr ""
 
-#: panel.cpp:2302
+#: panel.cpp:2301
 msgid "Failed to set glXSwapIntervalEXT"
 msgstr ""
 
-#: panel.cpp:2311
+#: panel.cpp:2310
 msgid "Failed to set glXSwapIntervalSGI"
 msgstr ""
 
-#: panel.cpp:2320
+#: panel.cpp:2319
 msgid "Failed to set glXSwapIntervalMESA"
 msgstr ""
 
-#: panel.cpp:2327
+#: panel.cpp:2326
 msgid "No support for wglGetExtensionsStringEXT"
 msgstr ""
 
-#: panel.cpp:2330
+#: panel.cpp:2329
 msgid "No support for WGL_EXT_swap_control"
 msgstr ""
 
-#: panel.cpp:2339
+#: panel.cpp:2338
 msgid "Failed to set wglSwapIntervalEXT"
 msgstr ""
 
-#: panel.cpp:2345
+#: panel.cpp:2344
 msgid "No VSYNC available on this platform"
 msgstr ""
 
-#: panel.cpp:2445
+#: panel.cpp:2444
 msgid "memory allocation error"
 msgstr ""
 
-#: panel.cpp:2448
+#: panel.cpp:2447
 msgid "error initializing codec"
 msgstr ""
 
-#: panel.cpp:2451
+#: panel.cpp:2450
 msgid "error writing to output file"
 msgstr ""
 
-#: panel.cpp:2454
+#: panel.cpp:2453
 msgid "can't guess output format from file name"
 msgstr ""
 
-#: panel.cpp:2459
+#: panel.cpp:2458
 msgid "programming error; aborting!"
 msgstr ""
 
-#: panel.cpp:2471 panel.cpp:2500
+#: panel.cpp:2470 panel.cpp:2499
 #, c-format
 msgid "Unable to begin recording to %s (%s)"
 msgstr ""
 
-#: panel.cpp:2528
+#: panel.cpp:2527
 #, c-format
 msgid "Error in audio / video recording (%s); aborting"
 msgstr ""
 
-#: panel.cpp:2534
+#: panel.cpp:2533
 #, c-format
 msgid "Error in audio recording (%s); aborting"
 msgstr ""
 
-#: panel.cpp:2544
+#: panel.cpp:2543
 #, c-format
 msgid "Error in video recording (%s); aborting"
 msgstr ""
@@ -1133,170 +1155,174 @@ msgstr ""
 msgid "B:"
 msgstr ""
 
-#: config/internal/option-internal.cpp:306
+#: config/internal/option-internal.cpp:320
 msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
-#: config/internal/option-internal.cpp:307
+#: config/internal/option-internal.cpp:321
 msgid "Full-screen filter to apply"
 msgstr ""
 
-#: config/internal/option-internal.cpp:308
+#: config/internal/option-internal.cpp:322
 msgid "Filter plugin library"
 msgstr ""
 
-#: config/internal/option-internal.cpp:309
+#: config/internal/option-internal.cpp:323
 msgid "Interframe blending function"
 msgstr ""
 
-#: config/internal/option-internal.cpp:310
+#: config/internal/option-internal.cpp:324
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:312
+#: config/internal/option-internal.cpp:326
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:314
+#: config/internal/option-internal.cpp:328
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:315
+#: config/internal/option-internal.cpp:329
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:317
+#: config/internal/option-internal.cpp:331
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:321
+#: config/internal/option-internal.cpp:335
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:323
+#: config/internal/option-internal.cpp:337
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:325
+#: config/internal/option-internal.cpp:339
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:327
-#: config/internal/option-internal.cpp:353
+#: config/internal/option-internal.cpp:341
+#: config/internal/option-internal.cpp:367
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:329
+#: config/internal/option-internal.cpp:343
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:331
+#: config/internal/option-internal.cpp:345
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:334
+#: config/internal/option-internal.cpp:348
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:337
+#: config/internal/option-internal.cpp:351
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:340
+#: config/internal/option-internal.cpp:354
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:342
+#: config/internal/option-internal.cpp:356
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:344
-#: config/internal/option-internal.cpp:374
+#: config/internal/option-internal.cpp:358
+#: config/internal/option-internal.cpp:388
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:346
+#: config/internal/option-internal.cpp:360
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:349
+#: config/internal/option-internal.cpp:363
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:359
+#: config/internal/option-internal.cpp:373
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:364
+#: config/internal/option-internal.cpp:378
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:366
+#: config/internal/option-internal.cpp:380
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:367
+#: config/internal/option-internal.cpp:381
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:369
+#: config/internal/option-internal.cpp:383
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:370
+#: config/internal/option-internal.cpp:384
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:371
+#: config/internal/option-internal.cpp:385
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:372
+#: config/internal/option-internal.cpp:386
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:378
+#: config/internal/option-internal.cpp:392
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:380
+#: config/internal/option-internal.cpp:394
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:382
+#: config/internal/option-internal.cpp:396
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:384
+#: config/internal/option-internal.cpp:398
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to "
 "ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:401
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:403
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:406
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:408
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:409
+msgid "INI file version (DO NOT MODIFY)"
+msgstr ""
+
+#: config/internal/option-internal.cpp:413
 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, "
@@ -1304,250 +1330,250 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:419
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:406
+#: config/internal/option-internal.cpp:421
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:410
+#: config/internal/option-internal.cpp:425
 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:416
+#: config/internal/option-internal.cpp:431
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:418
+#: config/internal/option-internal.cpp:433
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:420
+#: config/internal/option-internal.cpp:435
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:422
+#: config/internal/option-internal.cpp:437
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:426
+#: config/internal/option-internal.cpp:441
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:428
+#: config/internal/option-internal.cpp:443
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:445
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:431
+#: config/internal/option-internal.cpp:446
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:448
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:449
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:451
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:438
+#: config/internal/option-internal.cpp:453
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:440
+#: config/internal/option-internal.cpp:455
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:457
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:459
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:461
 msgid "Port to connect GDB to."
 msgstr ""
 
-#: config/internal/option-internal.cpp:449
+#: config/internal/option-internal.cpp:464
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:452
+#: config/internal/option-internal.cpp:467
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:454
+#: config/internal/option-internal.cpp:469
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:471
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:473
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:474
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:461
+#: config/internal/option-internal.cpp:476
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:478
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:465
+#: config/internal/option-internal.cpp:480
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:467
+#: config/internal/option-internal.cpp:482
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:484
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:472
+#: config/internal/option-internal.cpp:487
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:474
+#: config/internal/option-internal.cpp:489
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:477
+#: config/internal/option-internal.cpp:492
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:479
+#: config/internal/option-internal.cpp:494
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:496
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:498
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:484
+#: config/internal/option-internal.cpp:499
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:488
+#: config/internal/option-internal.cpp:503
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:504
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:506
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:507
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:508
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:509
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:499
+#: config/internal/option-internal.cpp:514
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:502
+#: config/internal/option-internal.cpp:517
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:518
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:507
+#: config/internal/option-internal.cpp:522
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:509
+#: config/internal/option-internal.cpp:524
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:525
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:511
+#: config/internal/option-internal.cpp:526
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:528
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:515
+#: config/internal/option-internal.cpp:530
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:532
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:518
+#: config/internal/option-internal.cpp:533
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:520
+#: config/internal/option-internal.cpp:535
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:536
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:538
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:524
+#: config/internal/option-internal.cpp:539
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:525
+#: config/internal/option-internal.cpp:540
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:591
-#: config/internal/option-internal.cpp:611
-#: config/internal/option-internal.cpp:632
-#: config/internal/option-internal.cpp:652
-#: config/internal/option-internal.cpp:672
+#: config/internal/option-internal.cpp:606
+#: config/internal/option-internal.cpp:626
+#: config/internal/option-internal.cpp:647
+#: config/internal/option-internal.cpp:667
+#: config/internal/option-internal.cpp:687
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -1567,26 +1593,26 @@ msgstr ""
 msgid "Invalid value %d for option %s; valid values are %s"
 msgstr ""
 
-#: dialogs/display-config.cpp:55
+#: dialogs/display-config.cpp:56
 msgid "Invalid value for Default magnification."
 msgstr ""
 
-#: dialogs/display-config.cpp:385
+#: dialogs/display-config.cpp:390
 #, c-format
 msgid "No usable rpi plugins found in %s"
 msgstr ""
 
-#: dialogs/display-config.cpp:421 dialogs/display-config.cpp:463
+#: dialogs/display-config.cpp:429 dialogs/display-config.cpp:471
 #: xrc/DisplayConfig.xrc:107
 msgid "Plugin"
 msgstr ""
 
-#: dialogs/display-config.cpp:428
+#: dialogs/display-config.cpp:436
 #, c-format
 msgid "Using pixel filter: %s"
 msgstr ""
 
-#: dialogs/display-config.cpp:435
+#: dialogs/display-config.cpp:443
 #, c-format
 msgid "Using interframe blending: %s"
 msgstr ""
diff --git a/src/wx/cmdevents.cpp b/src/wx/cmdevents.cpp
index a0a958cd..5bcd6fda 100644
--- a/src/wx/cmdevents.cpp
+++ b/src/wx/cmdevents.cpp
@@ -208,10 +208,10 @@ EVT_HANDLER(RecentReset, "Reset recent ROM list")
         while (gopts.recent->GetCount())
             gopts.recent->RemoveFileFromHistory(0);
 
-        wxFileConfig* cfg = wxGetApp().cfg;
-        cfg->SetPath(wxT("/Recent"));
+        wxConfigBase* cfg = wxConfigBase::Get();
+        cfg->SetPath("/Recent");
         gopts.recent->Save(*cfg);
-        cfg->SetPath(wxT("/"));
+        cfg->SetPath("/");
         cfg->Flush();
     }
 }
@@ -2857,14 +2857,12 @@ EVT_HANDLER(UpdateEmu, "Check for updates...")
 
 EVT_HANDLER(FactoryReset, "Factory Reset...")
 {
-    wxMessageDialog dlg(NULL, wxString(wxT(
-"YOUR CONFIGURATION WILL BE DELETED!\n\n")) + wxString(wxT(
-"Are you sure?")),
-                        wxT("FACTORY RESET"), wxYES_NO | wxNO_DEFAULT | wxCENTRE);
+    wxMessageDialog dlg(
+        nullptr, _("YOUR CONFIGURATION WILL BE DELETED!\n\nAre you sure?"),
+        _("FACTORY RESET"), wxYES_NO | wxNO_DEFAULT | wxCENTRE);
 
     if (dlg.ShowModal() == wxID_YES) {
-        wxGetApp().cfg->DeleteAll();
-
+        wxConfigBase::Get()->DeleteAll();
         wxExecute(wxStandardPaths::Get().GetExecutablePath(), wxEXEC_ASYNC);
         Close(true);
     }
diff --git a/src/wx/config/internal/option-internal.cpp b/src/wx/config/internal/option-internal.cpp
index e7180177..dfeb2009 100644
--- a/src/wx/config/internal/option-internal.cpp
+++ b/src/wx/config/internal/option-internal.cpp
@@ -161,6 +161,9 @@ std::array<Option, kNbOptions>& Option::All() {
         double video_scale = 3;
         bool retain_aspect = true;
 
+        /// General
+        uint32_t ini_version = kIniLatestVersion;
+
         /// Geometry
         bool window_maximized = false;
         uint32_t window_height = 0;
@@ -226,6 +229,7 @@ std::array<Option, kNbOptions>& Option::All() {
         Option(OptionID::kGenScreenshotDir, &gopts.scrshot_dir),
         Option(OptionID::kGenStateDir, &gopts.state_dir),
         Option(OptionID::kGenStatusBar, &gopts.statusbar),
+        Option(OptionID::kGenIniVersion, &g_owned_opts.ini_version, 0, std::numeric_limits<uint32_t>::max()),
 
         /// Joypad
         Option(OptionID::kJoy),
@@ -402,6 +406,7 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
                _("Directory to store saved state files (relative paths are "
                  "relative to BatteryDir)")},
     OptionData{"General/StatusBar", "StatusBar", _("Enable status bar")},
+    OptionData{"General/IniVersion", "", _("INI file version (DO NOT MODIFY)")},
 
     /// Joypad
     OptionData{"Joypad/*/*", "",
diff --git a/src/wx/config/option-id.h b/src/wx/config/option-id.h
index fa385d46..e9744248 100644
--- a/src/wx/config/option-id.h
+++ b/src/wx/config/option-id.h
@@ -53,6 +53,7 @@ enum class OptionID {
     kGenScreenshotDir,
     kGenStateDir,
     kGenStatusBar,
+    kGenIniVersion,
 
     /// Joypad
     kJoy,
diff --git a/src/wx/config/option-proxy.h b/src/wx/config/option-proxy.h
index 8c00e13f..26812bd6 100644
--- a/src/wx/config/option-proxy.h
+++ b/src/wx/config/option-proxy.h
@@ -59,6 +59,7 @@ static constexpr std::array<Option::Type, kNbOptions> kOptionsTypes = {
     /*kGenScreenshotDir*/ Option::Type::kString,
     /*kGenStateDir*/ Option::Type::kString,
     /*kGenStatusBar*/ Option::Type::kBool,
+    /*kGenIniVersion*/ Option::Type::kUnsigned,
 
     /// Joypad
     /*kJoy*/ Option::Type::kNone,
diff --git a/src/wx/config/option.h b/src/wx/config/option.h
index 3e76872b..ede83edc 100644
--- a/src/wx/config/option.h
+++ b/src/wx/config/option.h
@@ -79,6 +79,10 @@ enum class RenderMethod {
 static constexpr size_t kNbRenderMethods =
     static_cast<size_t>(RenderMethod::kLast);
 
+// This is incremented whenever we want to change a default value between
+// release versions. The option update code is in load_opts.
+static constexpr uint32_t kIniLatestVersion = 1;
+
 // Represents a single option saved in the INI file. Option does not own the
 // individual option, but keeps a pointer to where the data is actually saved.
 //
diff --git a/src/wx/opts.cpp b/src/wx/opts.cpp
index c11795e1..80d648cf 100644
--- a/src/wx/opts.cpp
+++ b/src/wx/opts.cpp
@@ -1,11 +1,12 @@
 #include "opts.h"
 
 #include <algorithm>
+#include <limits>
 #include <memory>
 #include <unordered_set>
 
+#include <wx/defs.h>
 #include <wx/log.h>
-#include <wx/display.h>
 
 #include "config/option-observer.h"
 #include "config/option-proxy.h"
@@ -25,7 +26,7 @@
 namespace {
 
 void SaveOption(config::Option* option) {
-    wxFileConfig* cfg = wxGetApp().cfg;
+    wxConfigBase* cfg = wxConfigBase::Get();
 
     switch (option->type()) {
         case config::Option::Type::kNone:
@@ -72,6 +73,33 @@ void InitializeOptionObservers() {
     }
 }
 
+// Helper function to work around wxWidgets limitations when converting string
+// to unsigned int.
+uint32_t LoadUnsignedOption(wxConfigBase* cfg,
+                            const wxString& option_name,
+                            uint32_t default_value) {
+    wxString temp;
+    if (!cfg->Read(option_name, &temp)) {
+        return default_value;
+    }
+    if (!temp.IsNumber()) {
+        return default_value;
+    }
+
+    // Go through ulonglong to get enough space to work with. Also, older
+    // versions do not have a conversion function for unsigned int.
+    wxULongLong_t out;
+    if (!temp.ToULongLong(&out)) {
+        return default_value;
+    }
+
+    if (out > std::numeric_limits<uint32_t>::max()) {
+        return default_value;
+    }
+
+    return out;
+}
+
 }  // namespace
 
 #define WJKB config::UserInput
@@ -317,7 +345,7 @@ opts_t::opts_t()
 }
 
 // FIXME: simulate MakeInstanceFilename(vbam.ini) using subkeys (Slave%d/*)
-void load_opts() {
+void load_opts(bool first_time_launch) {
     // just for sanity...
     static bool did_init = false;
     assert(!did_init);
@@ -326,8 +354,9 @@ void load_opts() {
     // enumvals should not be translated, since they would cause config file
     // change after lang change
     // instead, translate when presented to user
-    wxFileConfig* cfg = wxGetApp().cfg;
-    cfg->SetPath(wxT("/"));
+    wxConfigBase* cfg = wxConfigBase::Get();
+    cfg->SetPath("/");
+
     // enure there are no unknown options present
     // note that items cannot be deleted until after loop or loop will fail
     wxArrayString item_del, grp_del;
@@ -341,9 +370,22 @@ void load_opts() {
         item_del.push_back(s);
     }
 
-    // Date of last online update check;
-    gopts.last_update = cfg->Read(wxT("General/LastUpdated"), (long)0);
-    cfg->Read(wxT("General/LastUpdatedFileName"), &gopts.last_updated_filename);
+    // Read the IniVersion now since the Option initialization code will reset
+    // it to kIniLatestVersion if it is unset.
+    uint32_t ini_version = 0;
+    if (first_time_launch) {
+        // Just go with the default values for the first time launch.
+        ini_version = config::kIniLatestVersion;
+    } else {
+        // We want to default to 0 if the option is not set.
+        ini_version = LoadUnsignedOption(cfg, "General/IniVersion", 0);
+        if (ini_version > config::kIniLatestVersion) {
+            wxLogWarning(
+                _("The INI file was written for a more recent version of "
+                  "VBA-M. Some INI option values may have been reset."));
+            ini_version = config::kIniLatestVersion;
+        }
+    }
 
     for (cont = cfg->GetFirstGroup(s, grp_idx); cont;
          cont = cfg->GetNextGroup(s, grp_idx)) {
@@ -464,8 +506,8 @@ void load_opts() {
             break;
         }
         case config::Option::Type::kUnsigned: {
-            int temp;
-            cfg->Read(opt.config_name(), &temp, opt.GetUnsigned());
+            uint32_t temp =
+                LoadUnsignedOption(cfg, opt.config_name(), opt.GetUnsigned());
             opt.SetUnsigned(temp);
             break;
         }
@@ -537,11 +579,6 @@ void load_opts() {
         }
     }
 
-    // Make sure link_timeout is not set to 1, which was the previous default.
-    if (gopts.link_timeout <= 1) {
-        gopts.link_timeout = 500;
-    }
-
     // recent is special
     // Recent does not get written with defaults
     cfg->SetPath(wxT("/Recent"));
@@ -549,6 +586,8 @@ void load_opts() {
     cfg->SetPath(wxT("/"));
     cfg->Flush();
 
+    InitializeOptionObservers();
+
     // We default the MaxThreads option to 0, so set it to the CPU count here.
     config::OptionProxy<config::OptionID::kDispMaxThreads> max_threads;
     if (max_threads == 0) {
@@ -563,13 +602,32 @@ void load_opts() {
         }
     }
 
-    InitializeOptionObservers();
+    // Apply Option updates.
+    while (ini_version < config::kIniLatestVersion) {
+        // Update the ini version as we go in case we fail halfway through.
+        OPTION(kGenIniVersion) = ini_version;
+        switch (ini_version) {
+            case 0: { // up to 2.1.5 included.
+#ifndef NO_LINK
+                // Previous default was 1.
+                if (OPTION(kGBALinkTimeout) == 1) {
+                    OPTION(kGBALinkTimeout) = 500;
+                }
+#endif
+                // Previous default was true.
+                OPTION(kGBALCDFilter) = false;
+            }
+        }
+        ini_version++;
+    }
+
+    // Finally, overwrite the value to the current version.
+    OPTION(kGenIniVersion) = config::kIniLatestVersion;
 }
 
 // Note: run load_opts() first to guarantee all config opts exist
-void update_opts()
-{
-    wxFileConfig* cfg = wxGetApp().cfg;
+void update_opts() {
+    wxConfigBase* cfg = wxConfigBase::Get();
 
     for (config::Option& opt : config::Option::All()) {
         SaveOption(&opt);
diff --git a/src/wx/opts.h b/src/wx/opts.h
index 5dd50024..7386c4e1 100644
--- a/src/wx/opts.h
+++ b/src/wx/opts.h
@@ -53,8 +53,6 @@ extern struct opts_t {
     bool autoload_state = false;
     bool autoload_cheats = false;
     wxString battery_dir;
-    long last_update;
-    wxString last_updated_filename;
     bool recent_freeze = false;
     wxString recording_dir;
     int rewind_interval = 0;
@@ -116,7 +114,7 @@ extern const int num_def_accels;
 // call to load config (once)
 // will write defaults for options not present and delete bad opts
 // will also initialize opts[] array translations
-void load_opts();
+void load_opts(bool first_time_launch);
 // call whenever opt vars change
 // will detect changes and write config if necessary
 void update_opts();
diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
index 96115003..a43f278b 100644
--- a/src/wx/panel.cpp
+++ b/src/wx/panel.cpp
@@ -170,14 +170,14 @@ void GameArea::LoadGame(const wxString& name)
     }
 
     {
-        wxFileConfig* cfg = wxGetApp().cfg;
+        wxConfigBase* cfg = wxConfigBase::Get();
 
         if (!gopts.recent_freeze) {
             gopts.recent->AddFileToHistory(name);
             wxGetApp().frame->SetRecentAccels();
-            cfg->SetPath(wxT("/Recent"));
+            cfg->SetPath("/Recent");
             gopts.recent->Save(*cfg);
-            cfg->SetPath(wxT("/"));
+            cfg->SetPath("/");
             cfg->Flush();
         }
     }
diff --git a/src/wx/wxvbam.cpp b/src/wx/wxvbam.cpp
index f0b8fcbd..96aa7aa9 100644
--- a/src/wx/wxvbam.cpp
+++ b/src/wx/wxvbam.cpp
@@ -38,6 +38,11 @@
 #include "strutils.h"
 #include "wayland.h"
 
+namespace {
+static const wxString kOldConfigFileName("vbam.conf");
+static const wxString knewConfigFileName("vbam.ini");
+}  // namespace
+
 #ifdef __WXMSW__
 
 int __stdcall WinMain(HINSTANCE hInstance,
@@ -197,16 +202,14 @@ const wxString wxvbamApp::GetPluginsDir()
     return wxStandardPaths::Get().GetPluginsDir();
 }
 
-wxString wxvbamApp::GetConfigurationPath()
-{
-    wxString config(wxT("vbam.ini"));
+wxString wxvbamApp::GetConfigurationPath() {
     // first check if config files exists in reverse order
     // (from system paths to more local paths.)
     if (data_path.empty()) {
         get_config_path(config_path);
 
         for (int i = config_path.size() - 1; i >= 0; i--) {
-            wxFileName fn(config_path[i], config);
+            wxFileName fn(config_path[i], knewConfigFileName);
 
             if (fn.FileExists() && fn.IsFileWritable()) {
                 data_path = config_path[i];
@@ -312,53 +315,52 @@ bool wxvbamApp::OnInit() {
 
     wxSetWorkingDirectory(cwd);
 
-    if (!cfg) {
-        // set up config file
-        // this needs to be in a subdir to support other config as well
-        // but subdir flag behaves differently 2.8 vs. 2.9.  Oh well.
-        // NOTE: this does not support XDG (freedesktop.org) paths
-        wxString confname(wxT("vbam.ini"));
-        wxFileName vbamconf(GetConfigurationPath(), confname);
-        // /MIGRATION
-        // migrate from 'vbam.{cfg,conf}' to 'vbam.ini' to manage a single config
-        // file for all platforms.
-        wxString oldConf(GetConfigurationPath() + wxT(FILE_SEP) + wxT("vbam.conf"));
-        wxString newConf(GetConfigurationPath() + wxT(FILE_SEP) + wxT("vbam.ini"));
+    if (!config_file_.IsOk()) {
+        // Set up the default configuration file.
+        // This needs to be in a subdir to support other config as well.
+        // NOTE: this does not support XDG (freedesktop.org) paths.
+        // We rely on wx to build the paths in a cross-platform manner. However,
+        // the wxFileName APIs are weird and don't quite work as intended so we
+        // use the wxString APIs for files instead.
+        const wxString old_conf_file(
+            wxFileName(GetConfigurationPath(), kOldConfigFileName)
+                .GetFullPath());
+        const wxString new_conf_file(
+            wxFileName(GetConfigurationPath(), knewConfigFileName)
+                .GetFullPath());
 
-        if (!wxFileExists(newConf) && wxFileExists(oldConf))
-            wxRenameFile(oldConf, newConf, false);
+        if (wxDirExists(new_conf_file)) {
+            wxLogError(_("Invalid configuration file provided: %s"),
+                       new_conf_file);
+            return false;
+        }
+
+        // /MIGRATION
+        // Migrate from 'vbam.conf' to 'vbam.ini' to manage a single config
+        // file for all platforms.
+        if (!wxFileExists(new_conf_file) && wxFileExists(old_conf_file)) {
+            wxRenameFile(old_conf_file, new_conf_file, false);
+        }
         // /END_MIGRATION
 
-        cfg = new wxFileConfig(wxT("vbam"), wxEmptyString,
-            vbamconf.GetFullPath(),
-            wxEmptyString, wxCONFIG_USE_LOCAL_FILE);
-        // set global config for e.g. Windows font mapping
-        wxFileConfig::Set(cfg);
-        // yet another bug/deficiency in wxConfig: dirs are not created if needed
-        // since a default config is always written, dirs are always needed
-        // Can't figure out statically if using wxFileConfig w/o duplicating wx's
-        // logic, so do it at run-time
-        // wxFileConfig *f = wxDynamicCast(cfg, wxFileConfig);
-        // wxConfigBase does not derive from wxObject!!! so no wxDynamicCast
-        wxFileConfig* fc = dynamic_cast<wxFileConfig*>(cfg);
-
-        if (fc) {
-            wxFileName s(wxFileConfig::GetLocalFileName(GetAppName()));
-            // at least up to 2.8.12, GetLocalFileName returns the dir if
-            // SUBDIR is specified instead of actual file name
-            // and SUBDIR only affects UNIX
-#if defined(__UNIX__) && !wxCHECK_VERSION(2, 9, 0)
-            s.AppendDir(s.GetFullName());
-#endif
-            // only the path part gets created
-            // note that 0777 is default (assumes umask will do og-w)
-            s.Mkdir(0777, wxPATH_MKDIR_FULL);
-            s = wxFileName::DirName(GetConfigurationPath());
-            s.Mkdir(0777, wxPATH_MKDIR_FULL);
-        }
+        config_file_ = new_conf_file;
     }
 
-    load_opts();
+    if (!config_file_.IsOk() || wxDirExists(config_file_.GetFullPath())) {
+        wxLogError(_("Invalid configuration file provided: %s"),
+                   config_file_.GetFullPath());
+        return false;
+    }
+
+    // wx takes ownership of the wxFileConfig here. It will be deleted on app
+    // destruction.
+    wxConfigBase::DontCreateOnDemand();
+    wxConfigBase::Set(new wxFileConfig("vbam", wxEmptyString,
+                                       config_file_.GetFullPath(),
+                                       wxEmptyString, wxCONFIG_USE_LOCAL_FILE));
+
+    // Load the default options.
+    load_opts(!config_file_.Exists());
 
     // wxGLCanvas segfaults under wayland before wx 3.2
 #if defined(HAVE_WAYLAND_SUPPORT) && !defined(HAVE_WAYLAND_EGL)
@@ -703,9 +705,7 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser& cl)
             wxLogError(_("Configuration file not found."));
             return false;
         }
-        cfg = new wxFileConfig(wxT("vbam"), wxEmptyString,
-            vbamconf.GetFullPath(),
-            wxEmptyString, wxCONFIG_USE_LOCAL_FILE);
+        config_file_ = s;
     }
 
 #if !defined(NO_LINK) && !defined(__WXMSW__)
diff --git a/src/wx/wxvbam.h b/src/wx/wxvbam.h
index 6e064df9..7b752ece 100644
--- a/src/wx/wxvbam.h
+++ b/src/wx/wxvbam.h
@@ -104,8 +104,6 @@ public:
         return accels;
     }
 
-    // the main configuration
-    wxFileConfig* cfg = nullptr;
     // vba-over.ini
     wxFileConfig* overrides = nullptr;
 
@@ -144,6 +142,9 @@ protected:
 private:
     wxPathList config_path;
     char* home = nullptr;
+
+    // Main configuration file.
+    wxFileName config_file_;
 };
 
 DECLARE_APP(wxvbamApp);