diff --git a/po/wxvbam/wxvbam.pot b/po/wxvbam/wxvbam.pot
index 083ad5a4..f58f9c5b 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-05-23 14:26-0700\n"
+"POT-Creation-Date: 2023-10-20 19:12+0000\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,60 +17,60 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: wxvbam.cpp:309
+#: wxvbam.cpp:322
 msgid "visualboyadvance-m"
 msgstr ""
 
-#: wxvbam.cpp:380 wxvbam.cpp:397
+#: wxvbam.cpp:393 wxvbam.cpp:410
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:536
+#: wxvbam.cpp:559
 msgid "Could not create main window"
 msgstr ""
 
-#: wxvbam.cpp:617
+#: wxvbam.cpp:640
 msgid "Save built-in XRC file and exit"
 msgstr ""
 
-#: wxvbam.cpp:620
+#: wxvbam.cpp:643
 msgid "Save built-in vba-over.ini and exit"
 msgstr ""
 
-#: wxvbam.cpp:623
+#: wxvbam.cpp:646
 msgid "Print configuration path and exit"
 msgstr ""
 
-#: wxvbam.cpp:626
+#: wxvbam.cpp:649
 msgid "Start in full-screen mode"
 msgstr ""
 
-#: wxvbam.cpp:629
+#: wxvbam.cpp:652
 msgid "Set a configuration file"
 msgstr ""
 
-#: wxvbam.cpp:633
+#: wxvbam.cpp:656
 msgid "Delete shared link state first, if it exists"
 msgstr ""
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:663
 msgid "List all settable options and exit"
 msgstr ""
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:666
 msgid "ROM file"
 msgstr ""
 
-#: wxvbam.cpp:645
+#: wxvbam.cpp:668
 msgid "<config>=<value>"
 msgstr ""
 
-#: wxvbam.cpp:676
+#: wxvbam.cpp:699
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:684
+#: wxvbam.cpp:707
 #, c-format
 msgid ""
 "Wrote built-in configuration to %s.\n"
@@ -79,11 +79,11 @@ msgid ""
 "built-in:"
 msgstr ""
 
-#: wxvbam.cpp:698
+#: wxvbam.cpp:721
 msgid "Configuration is read from, in order:"
 msgstr ""
 
-#: wxvbam.cpp:712
+#: wxvbam.cpp:735
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
@@ -91,13 +91,13 @@ msgid ""
 "from search path:"
 msgstr ""
 
-#: wxvbam.cpp:718
+#: wxvbam.cpp:741
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr ""
 
-#: wxvbam.cpp:733
+#: wxvbam.cpp:756
 msgid ""
 "Options set from the command line are saved if any configuration changes are "
 "made in the user interface.\n"
@@ -106,187 +106,187 @@ msgid ""
 "\n"
 msgstr ""
 
-#: wxvbam.cpp:741
+#: wxvbam.cpp:764
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr ""
 
-#: wxvbam.cpp:752
+#: wxvbam.cpp:775
 msgid "Configuration file not found."
 msgstr ""
 
-#: wxvbam.cpp:783
+#: wxvbam.cpp:806
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr ""
 
-#: guiinit.cpp:103
+#: guiinit.cpp:104
 msgid "Start!"
 msgstr ""
 
-#: guiinit.cpp:122 xrc/NetLink.xrc:99
+#: guiinit.cpp:123 xrc/NetLink.xrc:99
 msgid "Connect"
 msgstr ""
 
-#: guiinit.cpp:139
+#: guiinit.cpp:140
 msgid "You must enter a valid host name"
 msgstr ""
 
-#: guiinit.cpp:140
+#: guiinit.cpp:141
 msgid "Host name invalid"
 msgstr ""
 
-#: guiinit.cpp:158
+#: guiinit.cpp:159
 msgid "Waiting for clients..."
 msgstr ""
 
-#: guiinit.cpp:159
+#: guiinit.cpp:160
 #, c-format
 msgid "Server IP address is: %s\n"
 msgstr ""
 
-#: guiinit.cpp:161
+#: guiinit.cpp:162
 msgid "Waiting for connection..."
 msgstr ""
 
-#: guiinit.cpp:162
+#: guiinit.cpp:163
 #, c-format
 msgid "Connecting to %s\n"
 msgstr ""
 
-#: guiinit.cpp:195
+#: guiinit.cpp:196
 msgid ""
 "Error occurred.\n"
 "Please try again."
 msgstr ""
 
-#: guiinit.cpp:262 guiinit.cpp:315
+#: guiinit.cpp:263 guiinit.cpp:316
 msgid "Select cheat file"
 msgstr ""
 
-#: guiinit.cpp:263
+#: guiinit.cpp:264
 msgid "VBA cheat lists (*.clt)|*.clt|CHT cheat lists (*.cht)|*.cht"
 msgstr ""
 
-#: guiinit.cpp:282 panel.cpp:517
+#: guiinit.cpp:283 panel.cpp:517
 msgid "Loaded cheats"
 msgstr ""
 
-#: guiinit.cpp:316
+#: guiinit.cpp:317
 msgid "VBA cheat lists (*.clt)|*.clt"
 msgstr ""
 
-#: guiinit.cpp:334
+#: guiinit.cpp:335
 msgid "Saved cheats"
 msgstr ""
 
-#: guiinit.cpp:365 guiinit.cpp:384
+#: guiinit.cpp:366 guiinit.cpp:385
 msgid "Restore old values?"
 msgstr ""
 
-#: guiinit.cpp:366 guiinit.cpp:385
+#: guiinit.cpp:367 guiinit.cpp:386
 msgid "Removing cheats"
 msgstr ""
 
-#: guiinit.cpp:776 dialogs/gb-rom-info.cpp:60 xrc/JoyPanel.xrc:364
+#: guiinit.cpp:777 dialogs/gb-rom-info.cpp:60 xrc/JoyPanel.xrc:364
 msgid "Game Shark"
 msgstr ""
 
-#: guiinit.cpp:777 dialogs/gb-rom-info.cpp:57
+#: guiinit.cpp:778 dialogs/gb-rom-info.cpp:57
 msgid "Game Genie"
 msgstr ""
 
-#: guiinit.cpp:779
+#: guiinit.cpp:780
 msgid "Generic Code"
 msgstr ""
 
-#: guiinit.cpp:780
+#: guiinit.cpp:781
 msgid "Game Shark Advance"
 msgstr ""
 
-#: guiinit.cpp:781
+#: guiinit.cpp:782
 msgid "Code Breaker Advance"
 msgstr ""
 
-#: guiinit.cpp:782
+#: guiinit.cpp:783
 msgid "Flashcart CHT"
 msgstr ""
 
-#: guiinit.cpp:850 guiinit.cpp:1105
+#: guiinit.cpp:851 guiinit.cpp:1106
 msgid "Number cannot be empty"
 msgstr ""
 
-#: guiinit.cpp:900
+#: guiinit.cpp:901
 msgid "Search produced no results"
 msgstr ""
 
-#: guiinit.cpp:1063
+#: guiinit.cpp:1064
 msgid "8-bit "
 msgstr ""
 
-#: guiinit.cpp:1067
+#: guiinit.cpp:1068
 msgid "16-bit "
 msgstr ""
 
-#: guiinit.cpp:1071
+#: guiinit.cpp:1072
 msgid "32-bit "
 msgstr ""
 
-#: guiinit.cpp:1077
+#: guiinit.cpp:1078
 msgid "signed decimal"
 msgstr ""
 
-#: guiinit.cpp:1081
+#: guiinit.cpp:1082
 msgid "unsigned decimal"
 msgstr ""
 
-#: guiinit.cpp:1085
+#: guiinit.cpp:1086
 msgid "unsigned hexadecimal"
 msgstr ""
 
-#: guiinit.cpp:1486
+#: guiinit.cpp:1487
 #, c-format
 msgid "%d frames = %.2f ms"
 msgstr ""
 
-#: guiinit.cpp:1498
+#: guiinit.cpp:1499
 msgid "Default device"
 msgstr ""
 
-#: guiinit.cpp:1951
+#: guiinit.cpp:1918
 msgid "Main icon not found"
 msgstr ""
 
-#: guiinit.cpp:1969
+#: guiinit.cpp:1936
 msgid "Main display panel not found"
 msgstr ""
 
-#: guiinit.cpp:2228
+#: guiinit.cpp:2195
 #, c-format
 msgid "Invalid menu item %s; removing"
 msgstr ""
 
-#: guiinit.cpp:2413
+#: guiinit.cpp:2380
 msgid "Code"
 msgstr ""
 
-#: guiinit.cpp:2422
+#: guiinit.cpp:2389
 msgid "Description"
 msgstr ""
 
-#: guiinit.cpp:2496 xrc/CheatAdd.xrc:31
+#: guiinit.cpp:2463 xrc/CheatAdd.xrc:31
 msgid "Address"
 msgstr ""
 
-#: guiinit.cpp:2497
+#: guiinit.cpp:2464
 msgid "Old Value"
 msgstr ""
 
-#: guiinit.cpp:2498
+#: guiinit.cpp:2465
 msgid "New Value"
 msgstr ""
 
-#: guiinit.cpp:2872
+#: guiinit.cpp:2793
 msgid "JoyBus host invalid; disabling"
 msgstr ""
 
@@ -631,29 +631,29 @@ msgstr ""
 msgid "Could not initialize the sound driver!"
 msgstr ""
 
-#: cmdevents.cpp:2280
+#: cmdevents.cpp:2284
 msgid ""
 "YOUR CONFIGURATION WILL BE DELETED!\n"
 "\n"
 "Are you sure?"
 msgstr ""
 
-#: cmdevents.cpp:2281
+#: cmdevents.cpp:2285
 msgid "FACTORY RESET"
 msgstr ""
 
-#: cmdevents.cpp:2316
+#: cmdevents.cpp:2320
 msgid "Nintendo Game Boy / Color / Advance emulator."
 msgstr ""
 
-#: cmdevents.cpp:2317
+#: cmdevents.cpp:2321
 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:2319
+#: cmdevents.cpp:2323
 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"
@@ -669,15 +669,15 @@ msgid ""
 "along with this program. If not, see http://www.gnu.org/licenses ."
 msgstr ""
 
-#: cmdevents.cpp:2504
+#: cmdevents.cpp:2508
 msgid "Cannot use Game Boy BIOS when Colorizer Hack is enabled."
 msgstr ""
 
-#: cmdevents.cpp:2558
+#: cmdevents.cpp:2564
 msgid "LAN link is already active. Disable link mode to disconnect."
 msgstr ""
 
-#: cmdevents.cpp:2564
+#: cmdevents.cpp:2570
 msgid "Network is not supported in local mode."
 msgstr ""
 
@@ -715,17 +715,17 @@ msgid ""
 "values may have been reset."
 msgstr ""
 
-#: opts.cpp:457 opts.cpp:477 opts.cpp:662
+#: opts.cpp:457 opts.cpp:477 opts.cpp:665
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr ""
 
-#: opts.cpp:598 opts.cpp:607 opts.cpp:616 opts.cpp:625 config/option.cpp:492
+#: opts.cpp:601 opts.cpp:610 opts.cpp:619 opts.cpp:628 config/option.cpp:492
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
 
-#: opts.cpp:684
+#: opts.cpp:687
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -896,86 +896,86 @@ msgstr ""
 msgid "Error writing rewind state"
 msgstr ""
 
-#: panel.cpp:2285
+#: panel.cpp:2299
 msgid "Enabling EGL VSync."
 msgstr ""
 
-#: panel.cpp:2287
+#: panel.cpp:2301
 msgid "Disabling EGL VSync."
 msgstr ""
 
-#: panel.cpp:2294
+#: panel.cpp:2308
 msgid "Enabling GLX VSync."
 msgstr ""
 
-#: panel.cpp:2296
+#: panel.cpp:2310
 msgid "Disabling GLX VSync."
 msgstr ""
 
-#: panel.cpp:2314
+#: panel.cpp:2328
 msgid "Failed to set glXSwapIntervalEXT"
 msgstr ""
 
-#: panel.cpp:2323
+#: panel.cpp:2337
 msgid "Failed to set glXSwapIntervalSGI"
 msgstr ""
 
-#: panel.cpp:2332
+#: panel.cpp:2346
 msgid "Failed to set glXSwapIntervalMESA"
 msgstr ""
 
-#: panel.cpp:2339
+#: panel.cpp:2353
 msgid "No support for wglGetExtensionsStringEXT"
 msgstr ""
 
-#: panel.cpp:2342
+#: panel.cpp:2356
 msgid "No support for WGL_EXT_swap_control"
 msgstr ""
 
-#: panel.cpp:2351
+#: panel.cpp:2365
 msgid "Failed to set wglSwapIntervalEXT"
 msgstr ""
 
-#: panel.cpp:2357
+#: panel.cpp:2371
 msgid "No VSYNC available on this platform"
 msgstr ""
 
-#: panel.cpp:2457
+#: panel.cpp:2473
 msgid "memory allocation error"
 msgstr ""
 
-#: panel.cpp:2460
+#: panel.cpp:2476
 msgid "error initializing codec"
 msgstr ""
 
-#: panel.cpp:2463
+#: panel.cpp:2479
 msgid "error writing to output file"
 msgstr ""
 
-#: panel.cpp:2466
+#: panel.cpp:2482
 msgid "can't guess output format from file name"
 msgstr ""
 
-#: panel.cpp:2471
+#: panel.cpp:2487
 msgid "programming error; aborting!"
 msgstr ""
 
-#: panel.cpp:2483 panel.cpp:2512
+#: panel.cpp:2499 panel.cpp:2528
 #, c-format
 msgid "Unable to begin recording to %s (%s)"
 msgstr ""
 
-#: panel.cpp:2540
+#: panel.cpp:2556
 #, c-format
 msgid "Error in audio / video recording (%s); aborting"
 msgstr ""
 
-#: panel.cpp:2546
+#: panel.cpp:2562
 #, c-format
 msgid "Error in audio recording (%s); aborting"
 msgstr ""
 
-#: panel.cpp:2556
+#: panel.cpp:2572
 #, c-format
 msgid "Error in video recording (%s); aborting"
 msgstr ""
@@ -992,174 +992,174 @@ msgstr ""
 msgid "B:"
 msgstr ""
 
-#: config/internal/option-internal.cpp:376
+#: config/internal/option-internal.cpp:380
 msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
-#: config/internal/option-internal.cpp:377
+#: config/internal/option-internal.cpp:381
 msgid "Full-screen filter to apply"
 msgstr ""
 
-#: config/internal/option-internal.cpp:378
+#: config/internal/option-internal.cpp:382
 msgid "Filter plugin library"
 msgstr ""
 
-#: config/internal/option-internal.cpp:379
+#: config/internal/option-internal.cpp:383
 msgid "Interframe blending function"
 msgstr ""
 
-#: config/internal/option-internal.cpp:380
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:382
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:384
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:391
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:391
+#: config/internal/option-internal.cpp:395
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:397
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
+#: config/internal/option-internal.cpp:399
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:397
-#: config/internal/option-internal.cpp:423
+#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:427
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:399
+#: config/internal/option-internal.cpp:403
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:408
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:411
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:410
+#: config/internal/option-internal.cpp:414
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:416
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:414
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:418
+#: config/internal/option-internal.cpp:448
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:416
+#: config/internal/option-internal.cpp:420
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:423
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:429
+#: config/internal/option-internal.cpp:433
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:438
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:440
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:441
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:443
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:440
+#: config/internal/option-internal.cpp:444
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:441
+#: config/internal/option-internal.cpp:445
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:446
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:452
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:450
+#: config/internal/option-internal.cpp:454
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:452
+#: config/internal/option-internal.cpp:456
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:454
+#: config/internal/option-internal.cpp:458
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to "
 "ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:457
+#: config/internal/option-internal.cpp:461
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:463
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:462
+#: config/internal/option-internal.cpp:466
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:464
+#: config/internal/option-internal.cpp:468
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:465
+#: config/internal/option-internal.cpp:469
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:473
 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, "
@@ -1167,254 +1167,254 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:479
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:477
+#: config/internal/option-internal.cpp:481
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:485
 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:487
+#: config/internal/option-internal.cpp:491
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:493
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:495
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:497
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:497
+#: config/internal/option-internal.cpp:501
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:499
+#: config/internal/option-internal.cpp:503
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:505
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:502
+#: config/internal/option-internal.cpp:506
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:508
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:505
+#: config/internal/option-internal.cpp:509
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:507
+#: config/internal/option-internal.cpp:511
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:509
+#: config/internal/option-internal.cpp:513
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:511
+#: config/internal/option-internal.cpp:515
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:517
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:515
+#: config/internal/option-internal.cpp:519
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:521
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:520
+#: config/internal/option-internal.cpp:524
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:527
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:525
+#: config/internal/option-internal.cpp:529
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:527
+#: config/internal/option-internal.cpp:531
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:529
+#: config/internal/option-internal.cpp:533
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:530
+#: config/internal/option-internal.cpp:534
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:536
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:534
+#: config/internal/option-internal.cpp:538
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:540
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:538
+#: config/internal/option-internal.cpp:542
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:544
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:547
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:545
+#: config/internal/option-internal.cpp:549
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:552
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:554
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:552
+#: config/internal/option-internal.cpp:556
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:554
+#: config/internal/option-internal.cpp:558
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:555
+#: config/internal/option-internal.cpp:559
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:563
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:564
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:566
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:567
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:568
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:569
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:574
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:573
+#: config/internal/option-internal.cpp:577
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:574
+#: config/internal/option-internal.cpp:578
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:575
+#: config/internal/option-internal.cpp:579
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:579
+#: config/internal/option-internal.cpp:583
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:581
+#: config/internal/option-internal.cpp:585
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:582
+#: config/internal/option-internal.cpp:586
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:583
+#: config/internal/option-internal.cpp:587
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:585
+#: config/internal/option-internal.cpp:589
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:587
+#: config/internal/option-internal.cpp:591
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:589
+#: config/internal/option-internal.cpp:593
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:590
+#: config/internal/option-internal.cpp:594
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:592
+#: config/internal/option-internal.cpp:596
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:593
+#: config/internal/option-internal.cpp:597
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:595
+#: config/internal/option-internal.cpp:599
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:596
+#: config/internal/option-internal.cpp:600
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:597
+#: config/internal/option-internal.cpp:601
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:663
-#: config/internal/option-internal.cpp:683
-#: config/internal/option-internal.cpp:704
-#: config/internal/option-internal.cpp:724
-#: config/internal/option-internal.cpp:744
+#: config/internal/option-internal.cpp:667
+#: config/internal/option-internal.cpp:687
+#: config/internal/option-internal.cpp:708
+#: config/internal/option-internal.cpp:728
+#: config/internal/option-internal.cpp:748
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -4329,3 +4329,7 @@ msgstr ""
 #: xrc/UIConfig.xrc:16
 msgid "Suspend ScreenSaver"
 msgstr ""
+
+#: xrc/UIConfig.xrc:23
+msgid "Force Dark Mode (requires restart)"
+msgstr ""
diff --git a/src/wx/config/internal/option-internal.cpp b/src/wx/config/internal/option-internal.cpp
index bb729d51..dc4ce0b5 100644
--- a/src/wx/config/internal/option-internal.cpp
+++ b/src/wx/config/internal/option-internal.cpp
@@ -348,6 +348,7 @@ std::array<Option, kNbOptions>& Option::All() {
         Option(OptionID::kUIAllowJoystickBackgroundInput, &g_owned_opts.allow_joystick_background_input),
         Option(OptionID::kUIHideMenuBar, &gopts.hide_menu_bar),
         Option(OptionID::kUISuspendScreenSaver, &gopts.suspend_screensaver),
+        Option(OptionID::kUIForceDarkMode, &gopts.force_dark_mode),
 
         /// Sound
         Option(OptionID::kSoundAudioAPI, &gopts.audio_api),
diff --git a/src/wx/config/option-id.h b/src/wx/config/option-id.h
index 90973157..42be4723 100644
--- a/src/wx/config/option-id.h
+++ b/src/wx/config/option-id.h
@@ -116,6 +116,7 @@ enum class OptionID {
     kUIAllowJoystickBackgroundInput,
     kUIHideMenuBar,
     kUISuspendScreenSaver,
+    kUIForceDarkMode,
 
     /// Sound
     kSoundAudioAPI,
diff --git a/src/wx/config/option-proxy.h b/src/wx/config/option-proxy.h
index 367162d4..5aad3399 100644
--- a/src/wx/config/option-proxy.h
+++ b/src/wx/config/option-proxy.h
@@ -120,6 +120,7 @@ static constexpr std::array<Option::Type, kNbOptions> kOptionsTypes = {
     /*kUIAllowJoystickBackgroundInput*/ Option::Type::kBool,
     /*kUIHideMenuBar*/ Option::Type::kBool,
     /*kUISuspendScreenSaver*/ Option::Type::kBool,
+    /*kUIForceDarkMode*/ Option::Type::kBool,
 
     /// Sound
     /*kSoundAudioAPI*/ Option::Type::kAudioApi,
diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp
index 8667b197..55058d3e 100644
--- a/src/wx/guiinit.cpp
+++ b/src/wx/guiinit.cpp
@@ -2622,6 +2622,7 @@ bool MainFrame::BindControls()
                     cb->Hide();
 #endif // !HAVE_XSS
         }
+        { getcbb("ForceDarkMode", gopts.force_dark_mode); }
         wxFilePickerCtrl* fp;
 #define getfp(n, o, l)                                     \
     do {                                                   \
diff --git a/src/wx/opts.h b/src/wx/opts.h
index 6f05bce4..5e8c6321 100644
--- a/src/wx/opts.h
+++ b/src/wx/opts.h
@@ -72,6 +72,7 @@ extern struct opts_t {
     /// UI Config
     bool hide_menu_bar = true;
     bool suspend_screensaver = false;
+    bool force_dark_mode = false;
 
     /// wxWindows
     // wxWidgets-generated options (opaque)
diff --git a/src/wx/wxvbam.cpp b/src/wx/wxvbam.cpp
index 63421882..b74e5014 100644
--- a/src/wx/wxvbam.cpp
+++ b/src/wx/wxvbam.cpp
@@ -374,7 +374,7 @@ bool wxvbamApp::OnInit() {
     }
 
     wxSetWorkingDirectory(cwd);
-
+    
     if (!config_file_.IsOk()) {
         // Set up the default configuration file.
         // This needs to be in a subdir to support other config as well.
@@ -434,6 +434,11 @@ bool wxvbamApp::OnInit() {
     }
 #endif
 
+#if defined(__WXMSW__) && wxCHECK_VERSION(3, 2, 3)
+    if (wxSystemAppearance::IsSystemDark())
+        MSWEnableDarkMode();
+#endif
+
     // process command-line options
     for (size_t i = 0; i < pending_optset.size(); i++) {
         auto parts = strutils::split(pending_optset[i], wxT('='));
diff --git a/src/wx/xrc/UIConfig.xrc b/src/wx/xrc/UIConfig.xrc
index f187f298..0615f6d0 100644
--- a/src/wx/xrc/UIConfig.xrc
+++ b/src/wx/xrc/UIConfig.xrc
@@ -18,6 +18,13 @@
         <flag>wxALL</flag>
         <border>5</border>
       </object>
+      <object class="sizeritem">
+        <object class="wxCheckBox" name="ForceDarkMode">
+          <label>Force Dark Mode (requires restart)</label>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
       <object class="sizeritem">
         <flag>wxALL|wxEXPAND</flag>
         <border>5</border>