From 2cec46f825408af3da2ae55c723db333f9c5e48f Mon Sep 17 00:00:00 2001
From: Fabrice de Gans <Steelskin@users.noreply.github.com>
Date: Sat, 4 Feb 2023 21:39:13 -0800
Subject: [PATCH] Clean-up ConfigManager options (#1067)

* Clean-up ConfigManager options

Many of the options in ConfigManager were not actually used.
* Some options are only used by wx, they have been moved to gopts. In
  addition, the type of the option has been changed to "bool" when
  applicable.
* Some options are only used by SDL and do not have a corresponding
  configuration option, they have been moved to the SDL implementation.
* Some options are not used at all, they have been removed.
---
 po/wxvbam/wxvbam.pot                       | 604 ++++++++++-----------
 src/common/ConfigManager.cpp               | 399 --------------
 src/common/ConfigManager.h                 |  92 ----
 src/sdl/SDL.cpp                            |  35 +-
 src/sdl/inputSDL.cpp                       |   4 +
 src/wx/cmdevents.cpp                       |  89 ++-
 src/wx/config/internal/option-internal.cpp |  83 ++-
 src/wx/config/option-id.h                  |   7 -
 src/wx/dialogs/display-config.cpp          |   2 +-
 src/wx/guiinit.cpp                         |  36 +-
 src/wx/opts.cpp                            |  40 +-
 src/wx/opts.h                              |  77 ++-
 src/wx/panel.cpp                           |  46 +-
 src/wx/sys.cpp                             |   1 +
 src/wx/wxvbam.cpp                          |   4 +-
 src/wx/xrc/MainMenu.xrc                    |   4 -
 16 files changed, 497 insertions(+), 1026 deletions(-)

diff --git a/po/wxvbam/wxvbam.pot b/po/wxvbam/wxvbam.pot
index d431c0d0..7b19773a 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: 2022-12-02 22:20+0000\n"
+"POT-Creation-Date: 2023-02-04 18:56-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"
@@ -163,7 +163,7 @@ msgstr ""
 msgid "VBA cheat lists (*.clt)|*.clt|CHT cheat lists (*.cht)|*.cht"
 msgstr ""
 
-#: guiinit.cpp:264 panel.cpp:506
+#: guiinit.cpp:264 panel.cpp:507
 msgid "Loaded cheats"
 msgstr ""
 
@@ -282,50 +282,50 @@ msgstr ""
 msgid "Main display panel not found"
 msgstr ""
 
-#: guiinit.cpp:2768
+#: guiinit.cpp:2757
 #, c-format
 msgid "Duplicate menu accelerator: %s for %s and %s; keeping first"
 msgstr ""
 
-#: guiinit.cpp:2782
+#: guiinit.cpp:2771
 #, c-format
 msgid "Menu accelerator %s for %s overrides default for %s ; keeping menu"
 msgstr ""
 
-#: guiinit.cpp:2922
+#: guiinit.cpp:2910
 #, c-format
 msgid "Invalid menu item %s; removing"
 msgstr ""
 
-#: guiinit.cpp:3125
+#: guiinit.cpp:3113
 msgid "Code"
 msgstr ""
 
-#: guiinit.cpp:3134
+#: guiinit.cpp:3122
 msgid "Description"
 msgstr ""
 
-#: guiinit.cpp:3208 xrc/CheatAdd.xrc:31
+#: guiinit.cpp:3196 xrc/CheatAdd.xrc:31
 msgid "Address"
 msgstr ""
 
-#: guiinit.cpp:3209
+#: guiinit.cpp:3197
 msgid "Old Value"
 msgstr ""
 
-#: guiinit.cpp:3210
+#: guiinit.cpp:3198
 msgid "New Value"
 msgstr ""
 
-#: guiinit.cpp:3682
+#: guiinit.cpp:3670
 msgid "Menu commands"
 msgstr ""
 
-#: guiinit.cpp:3705
+#: guiinit.cpp:3693
 msgid "Other commands"
 msgstr ""
 
-#: guiinit.cpp:3816
+#: guiinit.cpp:3804
 msgid "JoyBus host invalid; disabling"
 msgstr ""
 
@@ -334,7 +334,7 @@ msgid "Text files (*.txt;*.log)|*.txt;*.log|"
 msgstr ""
 
 #: viewers.cpp:562 viewers.cpp:772 gfxviewers.cpp:1600 gfxviewers.cpp:1742
-#: cmdevents.cpp:1187 cmdevents.cpp:1265 cmdevents.cpp:1335 cmdevents.cpp:1404
+#: cmdevents.cpp:1187 cmdevents.cpp:1265 cmdevents.cpp:1335 cmdevents.cpp:1406
 #: viewsupt.cpp:1180
 msgid "Select output file"
 msgstr ""
@@ -602,7 +602,7 @@ msgstr ""
 msgid "Confirm import"
 msgstr ""
 
-#: cmdevents.cpp:936 panel.cpp:449
+#: cmdevents.cpp:936 panel.cpp:450
 #, c-format
 msgid "Loaded battery %s"
 msgstr ""
@@ -685,7 +685,7 @@ msgstr ""
 msgid "Wrote battery %s"
 msgstr ""
 
-#: cmdevents.cpp:1129 panel.cpp:755
+#: cmdevents.cpp:1129 panel.cpp:756
 #, c-format
 msgid "Error writing battery %s"
 msgstr ""
@@ -712,91 +712,91 @@ msgstr ""
 msgid "Error saving snapshot file %s"
 msgstr ""
 
-#: cmdevents.cpp:1212 sys.cpp:557
+#: cmdevents.cpp:1212 sys.cpp:558
 #, c-format
 msgid "Wrote snapshot %s"
 msgstr ""
 
-#: cmdevents.cpp:1233 cmdevents.cpp:1303 cmdevents.cpp:1374 cmdevents.cpp:1438
+#: cmdevents.cpp:1233 cmdevents.cpp:1303 cmdevents.cpp:1374 cmdevents.cpp:1440
 msgid " files ("
 msgstr ""
 
-#: cmdevents.cpp:1469
+#: cmdevents.cpp:1473
 msgid "Select file"
 msgstr ""
 
-#: cmdevents.cpp:1786 cmdevents.cpp:1879
+#: cmdevents.cpp:1790 cmdevents.cpp:1883
 msgid "Select state file"
 msgstr ""
 
-#: cmdevents.cpp:1787 cmdevents.cpp:1880
+#: cmdevents.cpp:1791 cmdevents.cpp:1884
 msgid "VisualBoyAdvance saved game files|*.sgm"
 msgstr ""
 
-#: cmdevents.cpp:1910 cmdevents.cpp:1920 cmdevents.cpp:1931
+#: cmdevents.cpp:1914 cmdevents.cpp:1924 cmdevents.cpp:1935
 #, c-format
 msgid "Current state slot #%d"
 msgstr ""
 
-#: cmdevents.cpp:2001
+#: cmdevents.cpp:2005
 msgid "Cannot use Colorizer Hack when GB BIOS File is enabled."
 msgstr ""
 
-#: cmdevents.cpp:2216
+#: cmdevents.cpp:2220
 msgid "Sound enabled"
 msgstr ""
 
-#: cmdevents.cpp:2216
+#: cmdevents.cpp:2220
 msgid "Sound disabled"
 msgstr ""
 
-#: cmdevents.cpp:2229 cmdevents.cpp:2243
+#: cmdevents.cpp:2233 cmdevents.cpp:2247
 #, c-format
 msgid "Volume: %d%%"
 msgstr ""
 
-#: cmdevents.cpp:2318
+#: cmdevents.cpp:2322
 msgid "Set to 0 for pseudo tty"
 msgstr ""
 
-#: cmdevents.cpp:2320
+#: cmdevents.cpp:2324
 msgid "Port to wait for connection:"
 msgstr ""
 
-#: cmdevents.cpp:2321
+#: cmdevents.cpp:2325
 msgid "GDB Connection"
 msgstr ""
 
-#: cmdevents.cpp:2374
+#: cmdevents.cpp:2378
 #, c-format
 msgid "Waiting for connection at %s"
 msgstr ""
 
-#: cmdevents.cpp:2381
+#: cmdevents.cpp:2385
 #, c-format
 msgid "Waiting for connection on port %d"
 msgstr ""
 
-#: cmdevents.cpp:2384
+#: cmdevents.cpp:2388
 msgid "Waiting for GDB..."
 msgstr ""
 
-#: cmdevents.cpp:2808 panel.cpp:250 panel.cpp:364
+#: cmdevents.cpp:2812 panel.cpp:250 panel.cpp:365
 msgid "Could not initialize the sound driver!"
 msgstr ""
 
-#: cmdevents.cpp:2912
+#: cmdevents.cpp:2916
 msgid "Nintendo GameBoy (+Color+Advance) emulator."
 msgstr ""
 
-#: cmdevents.cpp:2913
+#: cmdevents.cpp:2917
 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:2914
+#: cmdevents.cpp:2918
 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"
@@ -812,15 +812,15 @@ msgid ""
 "along with this program.  If not, see http://www.gnu.org/licenses ."
 msgstr ""
 
-#: cmdevents.cpp:3165
+#: cmdevents.cpp:3156
 msgid "Cannot use GB BIOS when Colorizer Hack is enabled."
 msgstr ""
 
-#: cmdevents.cpp:3226
+#: cmdevents.cpp:3217
 msgid "LAN link is already active.  Disable link mode to disconnect."
 msgstr ""
 
-#: cmdevents.cpp:3232
+#: cmdevents.cpp:3223
 msgid "Network is not supported in local mode."
 msgstr ""
 
@@ -852,92 +852,92 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: opts.cpp:543 opts.cpp:564 opts.cpp:769
+#: opts.cpp:518 opts.cpp:539 opts.cpp:745
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr ""
 
-#: opts.cpp:692 opts.cpp:701 opts.cpp:710 opts.cpp:719 config/option.cpp:462
+#: opts.cpp:668 opts.cpp:677 opts.cpp:686 opts.cpp:695 config/option.cpp:462
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
 
-#: opts.cpp:791
+#: opts.cpp:767
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
 
-#: sys.cpp:195 sys.cpp:256
+#: sys.cpp:196 sys.cpp:257
 msgid "No game in progress to record"
 msgstr ""
 
-#: sys.cpp:213
+#: sys.cpp:214
 #, c-format
 msgid "Cannot open output file %s"
 msgstr ""
 
-#: sys.cpp:220 sys.cpp:240 sys.cpp:390
+#: sys.cpp:221 sys.cpp:241 sys.cpp:391
 msgid "Error writing game recording"
 msgstr ""
 
-#: sys.cpp:261
+#: sys.cpp:262
 msgid "Cannot play game recording while recording"
 msgstr ""
 
-#: sys.cpp:276
+#: sys.cpp:277
 #, c-format
 msgid "Cannot open recording file %s"
 msgstr ""
 
-#: sys.cpp:285 sys.cpp:295
+#: sys.cpp:286 sys.cpp:296
 msgid "Error reading game recording"
 msgstr ""
 
-#: sys.cpp:405 sys.cpp:424
+#: sys.cpp:406 sys.cpp:425
 msgid "Playback ended"
 msgstr ""
 
-#: sys.cpp:448
+#: sys.cpp:449
 #, c-format
 msgid "%d%%(%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:456
+#: sys.cpp:457
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: sys.cpp:878 xrc/GBPrinter.xrc:65
+#: sys.cpp:879 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr ""
 
-#: sys.cpp:912
+#: sys.cpp:913
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr ""
 
-#: sys.cpp:921
+#: sys.cpp:922
 msgid "Save printer image to"
 msgstr ""
 
-#: sys.cpp:935 sys.cpp:1118
+#: sys.cpp:936 sys.cpp:1119
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr ""
 
-#: sys.cpp:940 sys.cpp:1011
+#: sys.cpp:941 sys.cpp:1012
 msgid "&Close"
 msgstr ""
 
-#: sys.cpp:1006
+#: sys.cpp:1007
 msgid "Printed"
 msgstr ""
 
-#: sys.cpp:1308
+#: sys.cpp:1309
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr ""
 
-#: sys.cpp:1407
+#: sys.cpp:1408
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr ""
@@ -947,7 +947,7 @@ msgstr ""
 msgid "%s is not a valid ROM file"
 msgstr ""
 
-#: panel.cpp:165 panel.cpp:226 panel.cpp:302
+#: panel.cpp:165 panel.cpp:226 panel.cpp:303
 msgid "Problem loading file"
 msgstr ""
 
@@ -962,157 +962,157 @@ msgid ""
 "file."
 msgstr ""
 
-#: panel.cpp:278 panel.cpp:378
+#: panel.cpp:279 panel.cpp:379
 #, c-format
 msgid "Could not load BIOS %s"
 msgstr ""
 
-#: panel.cpp:301
+#: panel.cpp:302
 #, c-format
 msgid "Unable to load Game Boy Advance ROM %s"
 msgstr ""
 
-#: panel.cpp:538
+#: panel.cpp:539
 msgid " player "
 msgstr ""
 
-#: panel.cpp:703
+#: panel.cpp:704
 #, c-format
 msgid "Loaded state %s"
 msgstr ""
 
-#: panel.cpp:703
+#: panel.cpp:704
 #, c-format
 msgid "Error loading state %s"
 msgstr ""
 
-#: panel.cpp:727
+#: panel.cpp:728
 #, c-format
 msgid "Saved state %s"
 msgstr ""
 
-#: panel.cpp:727
+#: panel.cpp:728
 #, c-format
 msgid "Error saving state %s"
 msgstr ""
 
-#: panel.cpp:931
+#: panel.cpp:932
 #, c-format
 msgid "Fullscreen mode %dx%d-%d@%d not supported; looking for another"
 msgstr ""
 
-#: panel.cpp:969
+#: panel.cpp:970
 #, c-format
 msgid "Fullscreen mode %dx%d-%d@%d not supported"
 msgstr ""
 
-#: panel.cpp:974
+#: panel.cpp:975
 #, c-format
 msgid "Valid mode: %dx%d-%d@%d"
 msgstr ""
 
-#: panel.cpp:982
+#: panel.cpp:983
 #, c-format
 msgid "Chose mode %dx%d-%d@%d"
 msgstr ""
 
-#: panel.cpp:986
+#: panel.cpp:987
 #, c-format
 msgid "Failed to change mode to %dx%d-%d@%d"
 msgstr ""
 
-#: panel.cpp:1074
+#: panel.cpp:1075
 msgid "Not a valid GBA cartridge"
 msgstr ""
 
-#: panel.cpp:1242
+#: panel.cpp:1245
 msgid "No memory for rewinding"
 msgstr ""
 
-#: panel.cpp:1252
+#: panel.cpp:1255
 msgid "Error writing rewind state"
 msgstr ""
 
-#: panel.cpp:2269
+#: panel.cpp:2272
 msgid "Enabling EGL VSync."
 msgstr ""
 
-#: panel.cpp:2271
+#: panel.cpp:2274
 msgid "Disabling EGL VSync."
 msgstr ""
 
-#: panel.cpp:2278
+#: panel.cpp:2281
 msgid "Enabling GLX VSync."
 msgstr ""
 
-#: panel.cpp:2280
+#: panel.cpp:2283
 msgid "Disabling GLX VSync."
 msgstr ""
 
-#: panel.cpp:2297
+#: panel.cpp:2301
 msgid "Failed to set glXSwapIntervalEXT"
 msgstr ""
 
-#: panel.cpp:2306
+#: panel.cpp:2310
 msgid "Failed to set glXSwapIntervalSGI"
 msgstr ""
 
-#: panel.cpp:2315
+#: panel.cpp:2319
 msgid "Failed to set glXSwapIntervalMESA"
 msgstr ""
 
-#: panel.cpp:2322
+#: panel.cpp:2326
 msgid "No support for wglGetExtensionsStringEXT"
 msgstr ""
 
-#: panel.cpp:2325
+#: panel.cpp:2329
 msgid "No support for WGL_EXT_swap_control"
 msgstr ""
 
-#: panel.cpp:2334
+#: panel.cpp:2338
 msgid "Failed to set wglSwapIntervalEXT"
 msgstr ""
 
-#: panel.cpp:2340
+#: panel.cpp:2344
 msgid "No VSYNC available on this platform"
 msgstr ""
 
-#: panel.cpp:2440
+#: panel.cpp:2444
 msgid "memory allocation error"
 msgstr ""
 
-#: panel.cpp:2443
+#: panel.cpp:2447
 msgid "error initializing codec"
 msgstr ""
 
-#: panel.cpp:2446
+#: panel.cpp:2450
 msgid "error writing to output file"
 msgstr ""
 
-#: panel.cpp:2449
+#: panel.cpp:2453
 msgid "can't guess output format from file name"
 msgstr ""
 
-#: panel.cpp:2454
+#: panel.cpp:2458
 msgid "programming error; aborting!"
 msgstr ""
 
-#: panel.cpp:2466 panel.cpp:2495
+#: panel.cpp:2470 panel.cpp:2499
 #, c-format
 msgid "Unable to begin recording to %s (%s)"
 msgstr ""
 
-#: panel.cpp:2523
+#: panel.cpp:2527
 #, c-format
 msgid "Error in audio/video recording (%s); aborting"
 msgstr ""
 
-#: panel.cpp:2529
+#: panel.cpp:2533
 #, c-format
 msgid "Error in audio recording (%s); aborting"
 msgstr ""
 
-#: panel.cpp:2539
+#: panel.cpp:2543
 #, c-format
 msgid "Error in video recording (%s); aborting"
 msgstr ""
@@ -1129,170 +1129,170 @@ msgstr ""
 msgid "B:"
 msgstr ""
 
-#: config/internal/option-internal.cpp:320
+#: config/internal/option-internal.cpp:317
 msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
-#: config/internal/option-internal.cpp:321
+#: config/internal/option-internal.cpp:318
 msgid "Full-screen filter to apply"
 msgstr ""
 
-#: config/internal/option-internal.cpp:323
+#: config/internal/option-internal.cpp:320
 msgid "Filter plugin library"
 msgstr ""
 
-#: config/internal/option-internal.cpp:325
+#: config/internal/option-internal.cpp:322
 msgid "Interframe blending function"
 msgstr ""
 
-#: config/internal/option-internal.cpp:327
+#: config/internal/option-internal.cpp:324
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:330
+#: config/internal/option-internal.cpp:327
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:333
+#: config/internal/option-internal.cpp:330
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:335
+#: config/internal/option-internal.cpp:332
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:338
+#: config/internal/option-internal.cpp:335
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:341
+#: config/internal/option-internal.cpp:338
 msgid "BIOS file to use for GB, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:344
+#: config/internal/option-internal.cpp:341
 msgid "GB color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:346
+#: config/internal/option-internal.cpp:343
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:347
-#: config/internal/option-internal.cpp:379
+#: config/internal/option-internal.cpp:344
+#: config/internal/option-internal.cpp:376
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:349
+#: config/internal/option-internal.cpp:346
 msgid "BIOS file to use for GBC, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:352
+#: config/internal/option-internal.cpp:349
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:356
+#: config/internal/option-internal.cpp:353
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:360
+#: config/internal/option-internal.cpp:357
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:364
+#: config/internal/option-internal.cpp:361
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:368
+#: config/internal/option-internal.cpp:365
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:370
-#: config/internal/option-internal.cpp:400
+#: config/internal/option-internal.cpp:367
+#: config/internal/option-internal.cpp:397
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:372
+#: config/internal/option-internal.cpp:369
 msgid "Directory to look for GBC ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:376
+#: config/internal/option-internal.cpp:373
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:381
+#: config/internal/option-internal.cpp:378
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:384
+#: config/internal/option-internal.cpp:381
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:386
+#: config/internal/option-internal.cpp:383
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:385
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:391
+#: config/internal/option-internal.cpp:388
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:390
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
+#: config/internal/option-internal.cpp:392
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:397
+#: config/internal/option-internal.cpp:394
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:405
+#: config/internal/option-internal.cpp:402
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:404
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:410
+#: config/internal/option-internal.cpp:407
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:413
+#: config/internal/option-internal.cpp:410
 msgid ""
 "Directory to store A/V and game recordings (relative paths are relative to "
 "ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:417
+#: config/internal/option-internal.cpp:414
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:420
+#: config/internal/option-internal.cpp:417
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:424
+#: config/internal/option-internal.cpp:421
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:427
+#: config/internal/option-internal.cpp:424
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:429
 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, "
@@ -1300,270 +1300,250 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:436
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:439
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:447
+#: config/internal/option-internal.cpp:444
 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:454
+#: config/internal/option-internal.cpp:451
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:453
 msgid "Auto skip frames."
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:455
 msgid "Apply IPS/UPS/IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:460
+#: config/internal/option-internal.cpp:457
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:460
 msgid "Automatically enable border for Super GameBoy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:465
+#: config/internal/option-internal.cpp:462
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:467
+#: config/internal/option-internal.cpp:464
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:466
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:472 xrc/MainMenu.xrc:355
-msgid "Enable MMX"
-msgstr ""
-
-#: config/internal/option-internal.cpp:476
+#: config/internal/option-internal.cpp:469
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:477
+#: config/internal/option-internal.cpp:470
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:479
+#: config/internal/option-internal.cpp:472
 msgid "Flash size 0 = 64KB 1 = 128KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:482
+#: config/internal/option-internal.cpp:475
 msgid "Skip frames.  Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:486
-msgid "Fullscreen mode color depth (0 = any)"
-msgstr ""
-
-#: config/internal/option-internal.cpp:488
-msgid "Fullscreen mode frequency (0 = any)"
-msgstr ""
-
-#: config/internal/option-internal.cpp:490
-msgid "Fullscreen mode height (0 = desktop)"
-msgstr ""
-
-#: config/internal/option-internal.cpp:492
-msgid "Fullscreen mode width (0 = desktop)"
-msgstr ""
-
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:478
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:481
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:483
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:485
 msgid "Port to connect GDB to."
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:488
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:491
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:493
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:511
+#: config/internal/option-internal.cpp:496
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:499
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:501
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:504
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:506
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:508
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:511
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:529
+#: config/internal/option-internal.cpp:514
 msgid "Throttle game speed, even when accelerated (0-450%, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:518
 msgid "Set throttle for speedup key (0-3000%, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:521
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:525
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:527
 msgid "Use the specified BIOS file for GB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:529
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:546
+#: config/internal/option-internal.cpp:531
 msgid "Use the specified BIOS file for GBC"
 msgstr ""
 
-#: config/internal/option-internal.cpp:547
+#: config/internal/option-internal.cpp:532
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:552
+#: config/internal/option-internal.cpp:537
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:538
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:555
+#: config/internal/option-internal.cpp:540
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:542
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:561
+#: config/internal/option-internal.cpp:546
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:552
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:555
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:556
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:576
+#: config/internal/option-internal.cpp:561
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:579
+#: config/internal/option-internal.cpp:564
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:581
+#: config/internal/option-internal.cpp:566
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:583
+#: config/internal/option-internal.cpp:568
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:585
+#: config/internal/option-internal.cpp:570
 msgid "GBA sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:588
+#: config/internal/option-internal.cpp:573
 msgid "GBA sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:589
+#: config/internal/option-internal.cpp:574
 msgid "GB sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:591
+#: config/internal/option-internal.cpp:576
 msgid "GB echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:593
+#: config/internal/option-internal.cpp:578
 msgid "Enable GB sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:594
+#: config/internal/option-internal.cpp:579
 msgid "GB stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:597
+#: config/internal/option-internal.cpp:582
 msgid "GB surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:598
+#: config/internal/option-internal.cpp:583
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:600
+#: config/internal/option-internal.cpp:585
 msgid "Sound volume (%)"
 msgstr ""
 
-#: 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
+#: config/internal/option-internal.cpp:652
+#: config/internal/option-internal.cpp:672
+#: config/internal/option-internal.cpp:693
+#: config/internal/option-internal.cpp:713
+#: config/internal/option-internal.cpp:733
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -2971,7 +2951,7 @@ msgid ""
 "see entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:460
+#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:456
 msgid "Up"
 msgstr ""
 
@@ -2979,7 +2959,7 @@ msgstr ""
 msgid "A"
 msgstr ""
 
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:464
+#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:460
 msgid "Down"
 msgstr ""
 
@@ -2987,7 +2967,7 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:468
+#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:464
 msgid "Left"
 msgstr ""
 
@@ -2995,7 +2975,7 @@ msgstr ""
 msgid "L"
 msgstr ""
 
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:472
+#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:468
 msgid "Right"
 msgstr ""
 
@@ -3003,11 +2983,11 @@ msgstr ""
 msgid "R"
 msgstr ""
 
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:492
+#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:488
 msgid "Select"
 msgstr ""
 
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:496
+#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:492
 msgid "Start"
 msgstr ""
 
@@ -3435,7 +3415,7 @@ msgstr ""
 msgid "&GameCube"
 msgstr ""
 
-#: xrc/MainMenu.xrc:293 xrc/MainMenu.xrc:525
+#: xrc/MainMenu.xrc:293 xrc/MainMenu.xrc:521
 msgid "&Game Boy"
 msgstr ""
 
@@ -3451,8 +3431,8 @@ msgstr ""
 msgid "&Speed hack"
 msgstr ""
 
-#: xrc/MainMenu.xrc:310 xrc/MainMenu.xrc:316 xrc/MainMenu.xrc:391
-#: xrc/MainMenu.xrc:427
+#: xrc/MainMenu.xrc:310 xrc/MainMenu.xrc:316 xrc/MainMenu.xrc:387
+#: xrc/MainMenu.xrc:423
 msgid "&Configure ..."
 msgstr ""
 
@@ -3504,335 +3484,335 @@ msgstr ""
 msgid "&Retain aspect ratio"
 msgstr ""
 
-#: xrc/MainMenu.xrc:360
+#: xrc/MainMenu.xrc:356
 msgid "&Bilinear filter"
 msgstr ""
 
-#: xrc/MainMenu.xrc:371
+#: xrc/MainMenu.xrc:367
 msgid "&Keep window on top"
 msgstr ""
 
-#: xrc/MainMenu.xrc:376
+#: xrc/MainMenu.xrc:372
 msgid "&Status bar"
 msgstr ""
 
-#: xrc/MainMenu.xrc:380
+#: xrc/MainMenu.xrc:376
 msgid "&Disable on-screen display"
 msgstr ""
 
-#: xrc/MainMenu.xrc:384
+#: xrc/MainMenu.xrc:380
 msgid "&Transparent on-screen display"
 msgstr ""
 
-#: xrc/MainMenu.xrc:389
+#: xrc/MainMenu.xrc:385
 msgid "&Audio"
 msgstr ""
 
-#: xrc/MainMenu.xrc:394
+#: xrc/MainMenu.xrc:390
 msgid "&Increase volume"
 msgstr ""
 
-#: xrc/MainMenu.xrc:398
+#: xrc/MainMenu.xrc:394
 msgid "&Decrease volume"
 msgstr ""
 
-#: xrc/MainMenu.xrc:402
+#: xrc/MainMenu.xrc:398
 msgid "&Toggle sound"
 msgstr ""
 
-#: xrc/MainMenu.xrc:407
+#: xrc/MainMenu.xrc:403
 msgid "&GBA sound interpolation"
 msgstr ""
 
-#: xrc/MainMenu.xrc:412
+#: xrc/MainMenu.xrc:408
 msgid "&GB sound enhancement"
 msgstr ""
 
-#: xrc/MainMenu.xrc:416
+#: xrc/MainMenu.xrc:412
 msgid "&GB surround sound effect"
 msgstr ""
 
-#: xrc/MainMenu.xrc:420
+#: xrc/MainMenu.xrc:416
 msgid "&GB sound declicking"
 msgstr ""
 
-#: xrc/MainMenu.xrc:425
+#: xrc/MainMenu.xrc:421
 msgid "&Input"
 msgstr ""
 
-#: xrc/MainMenu.xrc:430
+#: xrc/MainMenu.xrc:426
 msgid "Allow &keyboard background input"
 msgstr ""
 
-#: xrc/MainMenu.xrc:434
+#: xrc/MainMenu.xrc:430
 msgid "Allow &joystick background input"
 msgstr ""
 
-#: xrc/MainMenu.xrc:439
+#: xrc/MainMenu.xrc:435
 msgid "&Autofire"
 msgstr ""
 
-#: xrc/MainMenu.xrc:441 xrc/MainMenu.xrc:476
+#: xrc/MainMenu.xrc:437 xrc/MainMenu.xrc:472
 msgid "&A"
 msgstr ""
 
-#: xrc/MainMenu.xrc:445 xrc/MainMenu.xrc:480
+#: xrc/MainMenu.xrc:441 xrc/MainMenu.xrc:476
 msgid "&B"
 msgstr ""
 
-#: xrc/MainMenu.xrc:449 xrc/MainMenu.xrc:484
+#: xrc/MainMenu.xrc:445 xrc/MainMenu.xrc:480
 msgid "&L"
 msgstr ""
 
-#: xrc/MainMenu.xrc:453 xrc/MainMenu.xrc:488
+#: xrc/MainMenu.xrc:449 xrc/MainMenu.xrc:484
 msgid "&R"
 msgstr ""
 
-#: xrc/MainMenu.xrc:458
+#: xrc/MainMenu.xrc:454
 msgid "&Autohold"
 msgstr ""
 
-#: xrc/MainMenu.xrc:502
+#: xrc/MainMenu.xrc:498
 msgid "&Game Boy Advance"
 msgstr ""
 
-#: xrc/MainMenu.xrc:504 xrc/MainMenu.xrc:527
+#: xrc/MainMenu.xrc:500 xrc/MainMenu.xrc:523
 msgid "Configure ..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:508
+#: xrc/MainMenu.xrc:504
 msgid "&Real-time clock"
 msgstr ""
 
-#: xrc/MainMenu.xrc:512
+#: xrc/MainMenu.xrc:508
 msgid "&Use BIOS file"
 msgstr ""
 
-#: xrc/MainMenu.xrc:516
+#: xrc/MainMenu.xrc:512
 msgid "&Debug print"
 msgstr ""
 
-#: xrc/MainMenu.xrc:520 xrc/MainMenu.xrc:535
+#: xrc/MainMenu.xrc:516 xrc/MainMenu.xrc:531
 msgid "&LCD Filter"
 msgstr ""
 
-#: xrc/MainMenu.xrc:531
+#: xrc/MainMenu.xrc:527
 msgid "&GB color option"
 msgstr ""
 
-#: xrc/MainMenu.xrc:539
+#: xrc/MainMenu.xrc:535
 msgid "&GB Colorizer Hack (requires restart)"
 msgstr ""
 
-#: xrc/MainMenu.xrc:543
+#: xrc/MainMenu.xrc:539
 msgid "&GB printer"
 msgstr ""
 
-#: xrc/MainMenu.xrc:547
+#: xrc/MainMenu.xrc:543
 msgid "&Gather a full page before printing"
 msgstr ""
 
-#: xrc/MainMenu.xrc:551
+#: xrc/MainMenu.xrc:547
 msgid "&Save printouts as screen captures"
 msgstr ""
 
-#: xrc/MainMenu.xrc:556
+#: xrc/MainMenu.xrc:552
 msgid "&Use GB BIOS file (requires restart)"
 msgstr ""
 
-#: xrc/MainMenu.xrc:560
+#: xrc/MainMenu.xrc:556
 msgid "&Use GBC BIOS file"
 msgstr ""
 
-#: xrc/MainMenu.xrc:565
+#: xrc/MainMenu.xrc:561
 msgid "&General ..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:568
+#: xrc/MainMenu.xrc:564
 msgid "&Speedup / Turbo ..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:571
+#: xrc/MainMenu.xrc:567
 msgid "D&irectories ..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:574
+#: xrc/MainMenu.xrc:570
 msgid "&Key Shortcuts ..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:577
+#: xrc/MainMenu.xrc:573
 msgid "&UI Settings ..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:581
+#: xrc/MainMenu.xrc:577
 msgid "&Tools"
 msgstr ""
 
-#: xrc/MainMenu.xrc:583
+#: xrc/MainMenu.xrc:579
 msgid "&Cheats"
 msgstr ""
 
-#: xrc/MainMenu.xrc:585
+#: xrc/MainMenu.xrc:581
 msgid "List &cheats ..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:588
+#: xrc/MainMenu.xrc:584
 msgid "Find c&heat ..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:592
+#: xrc/MainMenu.xrc:588
 msgid "A&utomatically save/load cheats"
 msgstr ""
 
-#: xrc/MainMenu.xrc:596
+#: xrc/MainMenu.xrc:592
 msgid "&Enable cheats"
 msgstr ""
 
-#: xrc/MainMenu.xrc:603
+#: xrc/MainMenu.xrc:599
 msgid "&Break into GDB"
 msgstr ""
 
-#: xrc/MainMenu.xrc:607
+#: xrc/MainMenu.xrc:603
 msgid "&Configure port..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:610
+#: xrc/MainMenu.xrc:606
 msgid "&Break on load"
 msgstr ""
 
-#: xrc/MainMenu.xrc:615
+#: xrc/MainMenu.xrc:611
 msgid "&Disconnect"
 msgstr ""
 
-#: xrc/MainMenu.xrc:617
+#: xrc/MainMenu.xrc:613
 msgid "&GDB"
 msgstr ""
 
-#: xrc/MainMenu.xrc:620
+#: xrc/MainMenu.xrc:616
 msgid "&Disassemble..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:623
+#: xrc/MainMenu.xrc:619
 msgid "&Logging..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:626
+#: xrc/MainMenu.xrc:622
 msgid "&IO Viewer..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:629
+#: xrc/MainMenu.xrc:625
 msgid "&Map Viewer..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:632
+#: xrc/MainMenu.xrc:628
 msgid "M&emory Viewer..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:635
+#: xrc/MainMenu.xrc:631
 msgid "&OAM Viewer..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:638
+#: xrc/MainMenu.xrc:634
 msgid "&Palette Viewer..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:641
+#: xrc/MainMenu.xrc:637
 msgid "&Tile Viewer..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:646
+#: xrc/MainMenu.xrc:642
 msgid "Show all video layers"
 msgstr ""
 
-#: xrc/MainMenu.xrc:650
+#: xrc/MainMenu.xrc:646
 msgid "BG &0"
 msgstr ""
 
-#: xrc/MainMenu.xrc:655
+#: xrc/MainMenu.xrc:651
 msgid "BG &1"
 msgstr ""
 
-#: xrc/MainMenu.xrc:660
+#: xrc/MainMenu.xrc:656
 msgid "BG &2"
 msgstr ""
 
-#: xrc/MainMenu.xrc:665
+#: xrc/MainMenu.xrc:661
 msgid "BG &3"
 msgstr ""
 
-#: xrc/MainMenu.xrc:670
+#: xrc/MainMenu.xrc:666
 msgid "&OBJ"
 msgstr ""
 
-#: xrc/MainMenu.xrc:675
+#: xrc/MainMenu.xrc:671
 msgid "&WIN 0"
 msgstr ""
 
-#: xrc/MainMenu.xrc:680
+#: xrc/MainMenu.xrc:676
 msgid "W&IN 1"
 msgstr ""
 
-#: xrc/MainMenu.xrc:685
+#: xrc/MainMenu.xrc:681
 msgid "O&BJ WIN"
 msgstr ""
 
-#: xrc/MainMenu.xrc:689
+#: xrc/MainMenu.xrc:685
 msgid "&View Layers"
 msgstr ""
 
-#: xrc/MainMenu.xrc:693
+#: xrc/MainMenu.xrc:689
 msgid "Channel &1"
 msgstr ""
 
-#: xrc/MainMenu.xrc:698
+#: xrc/MainMenu.xrc:694
 msgid "Channel &2"
 msgstr ""
 
-#: xrc/MainMenu.xrc:703
+#: xrc/MainMenu.xrc:699
 msgid "Channel &3"
 msgstr ""
 
-#: xrc/MainMenu.xrc:708
+#: xrc/MainMenu.xrc:704
 msgid "Channel &4"
 msgstr ""
 
-#: xrc/MainMenu.xrc:713
+#: xrc/MainMenu.xrc:709
 msgid "Direct Sound &A"
 msgstr ""
 
-#: xrc/MainMenu.xrc:718
+#: xrc/MainMenu.xrc:714
 msgid "Direct Sound &B"
 msgstr ""
 
-#: xrc/MainMenu.xrc:722
+#: xrc/MainMenu.xrc:718
 msgid "&Sound Channels"
 msgstr ""
 
-#: xrc/MainMenu.xrc:726
+#: xrc/MainMenu.xrc:722
 msgid "&Help"
 msgstr ""
 
-#: xrc/MainMenu.xrc:728
+#: xrc/MainMenu.xrc:724
 msgid "Report &Bugs"
 msgstr ""
 
-#: xrc/MainMenu.xrc:731
+#: xrc/MainMenu.xrc:727
 msgid "VBA-M Support &Forum"
 msgstr ""
 
-#: xrc/MainMenu.xrc:734
+#: xrc/MainMenu.xrc:730
 msgid "Translations"
 msgstr ""
 
-#: xrc/MainMenu.xrc:742
+#: xrc/MainMenu.xrc:738
 msgid "Check for updates"
 msgstr ""
 
-#: xrc/MainMenu.xrc:745
+#: xrc/MainMenu.xrc:741
 msgid "&Factory Reset..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:749
+#: xrc/MainMenu.xrc:745
 msgid "&About..."
 msgstr ""
 
diff --git a/src/common/ConfigManager.cpp b/src/common/ConfigManager.cpp
index bbd0ec72..2bdc7088 100644
--- a/src/common/ConfigManager.cpp
+++ b/src/common/ConfigManager.cpp
@@ -62,7 +62,6 @@ enum named_opts
 	OPT_AGB_PRINT = 1000,
 	OPT_AUTOFIRE,
 	OPT_AUTO_FRAME_SKIP,
-	OPT_AVI_RECORD_DIR,
 	OPT_BATTERY_DIR,
 	OPT_BIOS_FILE_NAME_GB,
 	OPT_BIOS_FILE_NAME_GBA,
@@ -72,47 +71,18 @@ enum named_opts
 	OPT_CPU_SAVE_TYPE,
 	OPT_DOTCODE_FILE_NAME_LOAD,
 	OPT_DOTCODE_FILE_NAME_SAVE,
-	OPT_EMULATOR_TYPE,
-	OPT_FS_ADAPTER,
-	OPT_FS_COLOR_DEPTH,
-	OPT_FS_FREQUENCY,
-	OPT_FS_HEIGHT,
-	OPT_FS_WIDTH,
 	OPT_GB_EMULATOR_TYPE,
 	OPT_GB_FRAME_SKIP,
 	OPT_GB_PALETTE_OPTION,
-	OPT_GDB_PORT,
-	OPT_GL_FILTER,
 	OPT_IFB_TYPE,
-	OPT_JOYPAD_DEFAULT,
-	OPT_LANGUAGE_OPTION,
-	OPT_LINK_AUTO,
-	OPT_LINK_HACKS,
-	OPT_LINK_HOST_ADDR,
-	OPT_LINK_MODE,
-	OPT_LINK_NUM_PLAYERS,
-	OPT_LINK_TIMEOUT,
-	OPT_MAX_SCALE,
-	OPT_MOVIE_RECORD_DIR,
 	OPT_OPT_FLASH_SIZE,
 	OPT_REWIND_TIMER,
-	OPT_ROM_DIR_GB,
-	OPT_ROM_DIR_GBA,
-	OPT_ROM_DIR_GBC,
 	OPT_RTC_ENABLED,
 	OPT_SAVE_DIR,
 	OPT_SCREEN_SHOT_DIR,
 	OPT_SHOW_SPEED,
 	OPT_SHOW_SPEED_TRANSPARENT,
 	OPT_SOUND_FILTERING,
-	OPT_SOUND_RECORD_DIR,
-	OPT_SYNCHRONIZE,
-	OPT_THREAD_PRIORITY,
-	OPT_VIDEO_OPTION,
-	OPT_WINDOW_HEIGHT,
-	OPT_WINDOW_POSITION_X,
-	OPT_WINDOW_POSITION_Y,
-	OPT_WINDOW_WIDTH,
 	OPT_SPEEDUP_THROTTLE,
 	OPT_SPEEDUP_FRAME_SKIP,
 	OPT_NO_SPEEDUP_THROTTLE_FRAME_SKIP
@@ -134,129 +104,45 @@ bool mirroringEnable = true;
 bool parseDebug = true;
 bool speedHack = false;
 bool speedup = false;
-bool gbaLcdFilter = false;
-bool gbLcdFilter = false;
-const char* aviRecordDir;
 const char* batteryDir;
 const char* biosFileNameGB;
 const char* biosFileNameGBA;
 const char* biosFileNameGBC;
 const char* loadDotCodeFile;
 const char* saveDotCodeFile;
-const char* linkHostAddr;
-const char* movieRecordDir;
-char* rewindMemory = NULL;
-const char* romDirGB;
-const char* romDirGBA;
-const char* romDirGBC;
 const char* saveDir;
 const char* screenShotDir;
-const char* soundRecordDir;
-int active = 1;
 int agbPrint;
-int autoFire;
 int autoFireMaxCount = 1;
-int autoFireToggle;
 int autoFrameSkip = 0;
-int autoLoadMostRecent;
 int autoPatch;
-int autoSaveLoadCheatList;
-int aviRecording;
 int captureFormat = 0;
 int cheatsEnabled = true;
 int colorizerHack = 0;
 int cpuDisableSfx = false;
 int cpuSaveType = 0;
-int enableMMX;
 int disableStatusMessages = 0;
-int dsoundDisableHardwareAcceleration;
-int filterHeight;
-int filterMagnification;
-int filterMT; // enable multi-threading for pixel filters
 int filter = kStretch2x;
-int filterWidth;
 int frameSkip = 1;
-int frameskipadjust;
-int fsAdapter;
-int fsColorDepth;
-int fsForceChange;
-int fsFrequency;
-int fsHeight;
-int fsWidth;
 int fullScreen;
-int fullScreenStretch;
-int gdbBreakOnLoad;
-int gdbPort;
-int glFilter;
 int ifbType = kIFBNone;
-int joypadDefault;
-int languageOption;
 int layerEnable = 0xff00;
 int layerSettings = 0xff00;
-int linkAuto;
-int linkHacks = 1;
-int linkMode;
-int linkNumPlayers;
-int linkTimeout = 500;
-int maxScale;
-int mouseCounter = 0;
-int movieFrame;
-int moviePlayFrame;
-int moviePlaying;
-int movieRecording;
 int openGL;
 int optFlashSize;
 int optPrintUsage;
-int paused;
 int pauseWhenInactive = 0;
 int preparedCheats = 0;
-int recentFreeze;
-int renderedFrames;
-int rewindCount;
-int rewindCounter;
-int rewindPos;
-int rewindSaveNeeded = 0;
 int rewindTimer = 0;
-int rewindTopPos;
 int rtcEnabled;
 int saveType = GBA_SAVE_AUTO;
-int screenMessage;
-int sensorX;
-int sensorY;
-int showRenderedFrames;
 int showSpeed;
 int showSpeedTransparent;
-int sizeX;
-int sizeY;
 int skipBios = 0;
 int skipSaveGameBattery = true;
 int skipSaveGameCheats = false;
-int soundRecording;
-int speedupToggle;
-int sunBars;
-int surfaceSizeX;
-int surfaceSizeY;
-int threadPriority;
-int tripleBuffering;
 int useBios = 0;
-int useBiosFileGB;
-int useBiosFileGBA;
-int useBiosFileGBC;
-int videoOption;
-int vsync;
-int wasPaused = 0;
-uint32_t windowHeight;
-int windowMaximized;
-int windowPositionX = 0;
-int windowPositionY = 0;
-uint32_t windowWidth;
-int winGbBorderOn;
 int winGbPrinterEnabled;
-int winPauseNextFrame;
-int* rewindSerials = NULL;
-uint32_t autoFrameSkipLastTime;
-uint32_t movieLastJoypad;
-uint32_t movieNextJoypad;
 uint32_t throttle = 100;
 uint32_t speedup_throttle = 100;
 uint32_t speedup_frame_skip = 9;
@@ -266,9 +152,6 @@ bool allowJoystickBackgroundInput = true;
 
 const char* preparedCheatCodes[MAX_CHEATS];
 
-FilterFunc filterFunction = 0;
-IFBFilterFunc ifbFunction = 0;
-
 // allow up to 100 IPS/UPS/PPF patches given on commandline
 int	patchNum = 0;
 char *patchNames[PATCH_MAX_NUM] = { NULL }; // and so on
@@ -279,19 +162,14 @@ void(*dbgSignal)(int, int) = remoteStubSignal;
 void(*dbgOutput)(const char *, uint32_t) = debuggerOutput;
 #endif
 
-char* homeDir = NULL;
 char* arg0 = NULL;
 
 
 struct option argOptions[] = {
-
 	{ "agb-print", required_argument, 0, OPT_AGB_PRINT },
 	{ "auto-frame-skip", required_argument, 0, OPT_AUTO_FRAME_SKIP },
-	{ "auto-load-most-recent", no_argument, &autoLoadMostRecent, 1 },
 	{ "auto-patch", no_argument, &autoPatch, 1 },
-	{ "auto-save-load-cheat-list", no_argument, &autoSaveLoadCheatList, 1 },
 	{ "autofire", required_argument, 0, OPT_AUTOFIRE },
-	{ "avi-record-dir", required_argument, 0, OPT_AVI_RECORD_DIR },
 	{ "battery-dir", required_argument, 0, OPT_BATTERY_DIR },
 	{ "bios", required_argument, 0, 'b' },
 	{ "bios-file-name-gb", required_argument, 0, OPT_BIOS_FILE_NAME_GB },
@@ -308,26 +186,16 @@ struct option argOptions[] = {
 	{ "cpu-disable-sfx", no_argument, &cpuDisableSfx, 1 },
 	{ "cpu-save-type", required_argument, 0, OPT_CPU_SAVE_TYPE },
 	{ "debug", no_argument, 0, 'd' },
-	{ "enable-mmx", no_argument, &enableMMX, 1 },
 	{ "disable-sfx", no_argument, &cpuDisableSfx, 1 },
 	{ "disable-status-messages", no_argument, &disableStatusMessages, 1 },
 	{ "dotcode-file-name-load", required_argument, 0, OPT_DOTCODE_FILE_NAME_LOAD },
 	{ "dotcode-file-name-save", required_argument, 0, OPT_DOTCODE_FILE_NAME_SAVE },
-	{ "emulator-type", required_argument, 0, OPT_EMULATOR_TYPE },
 	{ "filter", required_argument, 0, 'f' },
-	{ "filter-enable-multi-threading", no_argument, &filterMT, 1 },
-	{ "filter-mt", no_argument, &filterMT, 1 },
 	{ "flash-128k", no_argument, &optFlashSize, 1 },
 	{ "flash-64k", no_argument, &optFlashSize, 0 },
 	{ "flash-size", required_argument, 0, 'S' },
 	{ "frameskip", required_argument, 0, 's' },
-	{ "fs-adapter", required_argument, 0, OPT_FS_ADAPTER },
-	{ "fs-color-depth", required_argument, 0, OPT_FS_COLOR_DEPTH },
-	{ "fs-frequency", required_argument, 0, OPT_FS_FREQUENCY },
-	{ "fs-height", required_argument, 0, OPT_FS_HEIGHT },
-	{ "fs-width", required_argument, 0, OPT_FS_WIDTH },
 	{ "full-screen", no_argument, &fullScreen, 1 },
-	{ "full-screen-stretch", no_argument, &fullScreenStretch, 1 },
 	{ "gb-border-automatic", no_argument, &gbBorderAutomatic, 1 },
 	{ "gb-border-on", no_argument, &gbBorderOn, 1 },
 	{ "gb-color-option", no_argument, &gbColorOption, 1 },
@@ -336,22 +204,9 @@ struct option argOptions[] = {
 	{ "gb-palette-option", required_argument, 0, OPT_GB_PALETTE_OPTION },
 	{ "gb-printer", no_argument, &winGbPrinterEnabled, 1 },
 	{ "gdb", required_argument, 0, 'G' },
-	{ "gdb-break-on-load", no_argument, &gdbBreakOnLoad, 1 },
-	{ "gdb-port", required_argument, 0, OPT_GDB_PORT },
-	{ "gl-filter", required_argument, 0, OPT_GL_FILTER },
 	{ "help", no_argument, &optPrintUsage, 1 },
 	{ "ifb-filter", required_argument, 0, 'I' },
 	{ "ifb-type", required_argument, 0, OPT_IFB_TYPE },
-	{ "joypad-default", required_argument, 0, OPT_JOYPAD_DEFAULT },
-	{ "language-option", required_argument, 0, OPT_LANGUAGE_OPTION },
-	{ "link-auto", required_argument, 0, OPT_LINK_AUTO },
-	{ "link-hacks", required_argument, 0, OPT_LINK_HACKS },
-	{ "link-host-addr", required_argument, 0, OPT_LINK_HOST_ADDR },
-	{ "link-mode", required_argument, 0, OPT_LINK_MODE },
-	{ "link-num-players", required_argument, 0, OPT_LINK_NUM_PLAYERS },
-	{ "link-timeout", required_argument, 0, OPT_LINK_TIMEOUT },
-	{ "max-scale", required_argument, 0, OPT_MAX_SCALE },
-	{ "movie-record-dir", required_argument, 0, OPT_MOVIE_RECORD_DIR },
 	{ "no-agb-print", no_argument, &agbPrint, 0 },
 	{ "no-auto-frameskip", no_argument, &autoFrameSkip, 0 },
 	{ "no-debug", no_argument, 0, 'N' },
@@ -367,11 +222,7 @@ struct option argOptions[] = {
 	{ "patch", required_argument, 0, 'i' },
 	{ "pause-when-inactive", no_argument, &pauseWhenInactive, 1 },
 	{ "profile", optional_argument, 0, 'p' },
-	{ "recent-freeze", no_argument, &recentFreeze, 1 },
 	{ "rewind-timer", required_argument, 0, OPT_REWIND_TIMER },
-	{ "rom-dir-gb", required_argument, 0, OPT_ROM_DIR_GB },
-	{ "rom-dir-gba", required_argument, 0, OPT_ROM_DIR_GBA },
-	{ "rom-dir-gbc", required_argument, 0, OPT_ROM_DIR_GBC },
 	{ "rtc", no_argument, &rtcEnabled, 1 },
 	{ "rtc-enabled", required_argument, 0, OPT_RTC_ENABLED },
 	{ "save-auto", no_argument, &cpuSaveType, 0 },
@@ -391,27 +242,13 @@ struct option argOptions[] = {
 	{ "skip-save-game-battery", no_argument, &skipSaveGameBattery, 1 },
 	{ "skip-save-game-cheats", no_argument, &skipSaveGameCheats, 1 },
 	{ "sound-filtering", required_argument, 0, OPT_SOUND_FILTERING },
-	{ "sound-record-dir", required_argument, 0, OPT_SOUND_RECORD_DIR },
-	{ "stretch", no_argument, &fullScreenStretch, 1 },
-	{ "synchronize", required_argument, 0, OPT_SYNCHRONIZE },
-	{ "thread-priority", required_argument, 0, OPT_THREAD_PRIORITY },
 	{ "throttle", required_argument, 0, 'T' },
 	{ "speedup-throttle", required_argument, 0, OPT_SPEEDUP_THROTTLE },
 	{ "speedup-frame-skip", required_argument, 0, OPT_SPEEDUP_FRAME_SKIP },
 	{ "no-speedup-throttle-frame-skip", no_argument, 0, OPT_NO_SPEEDUP_THROTTLE_FRAME_SKIP },
-	{ "triple-buffering", no_argument, &tripleBuffering, 1 },
 	{ "use-bios", no_argument, &useBios, 1 },
-	{ "use-bios-file-gb", no_argument, &useBiosFileGB, 1 },
-	{ "use-bios-file-gba", no_argument, &useBiosFileGBA, 1 },
-	{ "use-bios-file-gbc", no_argument, &useBiosFileGBC, 1 },
 	{ "verbose", required_argument, 0, 'v' },
-	{ "video-option", required_argument, 0, OPT_VIDEO_OPTION },
-	{ "vsync", no_argument, &vsync, 1 },
 	{ "win-gb-printer-enabled", no_argument, &winGbPrinterEnabled, 1 },
-	{ "window-height", required_argument, 0, OPT_WINDOW_HEIGHT },
-	{ "window-position-x", required_argument, 0, OPT_WINDOW_POSITION_X },
-	{ "window-position-y", required_argument, 0, OPT_WINDOW_POSITION_Y },
-	{ "window-width", required_argument, 0, OPT_WINDOW_WIDTH },
 
 
 	{ NULL, no_argument, NULL, 0 }
@@ -470,11 +307,6 @@ void ValidateConfig()
 		rewindTimer = 0;
 	if (autoFireMaxCount < 1)
 		autoFireMaxCount = 1;
-
-	if (rewindTimer) {
-		rewindMemory = (char *)malloc(REWIND_NUM*REWIND_SIZE);
-		rewindSerials = (int *)calloc(REWIND_NUM, sizeof(int)); // init to zeroes
-	}
 }
 
 void LoadConfig()
@@ -484,10 +316,7 @@ void LoadConfig()
 	allowJoystickBackgroundInput = ReadPref("allowJoystickBackgroundInput", true);
 	autoFireMaxCount = fromDec(ReadPrefString("autoFireMaxCount"));
 	autoFrameSkip = ReadPref("autoFrameSkip", 0);
-	autoLoadMostRecent = ReadPref("autoLoadMostRecent", 0);
 	autoPatch = ReadPref("autoPatch", 1);
-	autoSaveLoadCheatList = ReadPref("autoSaveLoadCheatList", 1);
-	aviRecordDir = ReadPrefString("aviRecordDir");
 	batteryDir = ReadPrefString("batteryDir");
 	biosFileNameGB = ReadPrefString("biosFileGB");
 	biosFileNameGBA = ReadPrefString("biosFileGBA");
@@ -497,18 +326,10 @@ void LoadConfig()
 	colorizerHack = ReadPref("colorizerHack", 0);
 	cpuDisableSfx = ReadPref("disableSfx", 0);
 	cpuSaveType = ReadPrefHex("saveType");
-	enableMMX = ReadPref("enableMMX", 1);
 	disableStatusMessages = ReadPrefHex("disableStatus");
-	filterMT = ReadPref("filterEnableMultiThreading", 0);
 	filter = ReadPref("filter", 0);
 	frameSkip = ReadPref("frameSkip", 0);
-	fsAdapter = ReadPref("fsAdapter", 0);
-	fsColorDepth = ReadPref("fsColorDepth", 32);
-	fsFrequency = ReadPref("fsFrequency", 60);
-	fsHeight = ReadPref("fsHeight", 600);
-	fsWidth = ReadPref("fsWidth", 800);
 	fullScreen = ReadPrefHex("fullScreen");
-	fullScreenStretch = ReadPref("stretch", 0);
 	gbBorderAutomatic = ReadPref("borderAutomatic", 1);
 	gbBorderOn = ReadPrefHex("borderOn");
 	gbColorOption = ReadPref("colorOption", 0);
@@ -520,35 +341,12 @@ void LoadConfig()
 	gb_effects_config.enabled = ReadPref("gbSoundEffectsEnabled", 0);
 	gb_effects_config.stereo = (float)ReadPref("gbSoundEffectsStereo", 15) / 100.0f;
 	gb_effects_config.surround = ReadPref("gbSoundEffectsSurround", 0);
-	gdbBreakOnLoad = ReadPref("gdbBreakOnLoad", 0);
-	gdbPort = ReadPref("gdbPort", 55555);
-	glFilter = ReadPref("glFilter", 1);
 	ifbType = ReadPref("ifbType", 0);
-	joypadDefault = ReadPref("joypadDefault", 0);
-	languageOption = ReadPref("language", 1);
-	linkAuto = ReadPref("LinkAuto", 1);
-	linkHacks = ReadPref("LinkHacks", 0);
-	linkHostAddr = ReadPrefString("LinkHost", "localhost");
-	linkMode = ReadPref("LinkMode", 0); // LINK_DISCONNECTED = 0
-	linkNumPlayers = ReadPref("LinkNumPlayers", 2);
-
-	linkTimeout = ReadPref("LinkTimeout", 500);
-
-	// Previous default was 1, which is very wrong.
-	if (linkTimeout <= 1)
-	    linkTimeout = 500;
-
 	loadDotCodeFile = ReadPrefString("loadDotCodeFile");
-	maxScale = ReadPref("maxScale", 0);
-	movieRecordDir = ReadPrefString("movieRecordDir");
 	openGL = ReadPrefHex("openGL");
 	optFlashSize = ReadPref("flashSize", 0);
 	pauseWhenInactive = ReadPref("pauseWhenInactive", 1);
-	recentFreeze = ReadPref("recentFreeze", 0);
 	rewindTimer = ReadPref("rewindTimer", 0);
-	romDirGB = ReadPrefString("romDirGB");
-	romDirGBA = ReadPrefString("romDirGBA");
-	romDirGBC = ReadPrefString("romDirGBC");
 	rtcEnabled = ReadPref("rtcEnabled", 0);
 	saveDir = ReadPrefString("saveDir");
 	saveDotCodeFile = ReadPrefString("saveDotCodeFile");
@@ -560,25 +358,11 @@ void LoadConfig()
 	skipSaveGameCheats = ReadPref("skipSaveGameCheats", 0);
 	soundFiltering = (float)ReadPref("gbaSoundFiltering", 50) / 100.0f;
 	soundInterpolation = ReadPref("gbaSoundInterpolation", 1);
-	soundRecordDir = ReadPrefString("soundRecordDir");
-	threadPriority = ReadPref("priority", 2);
 	throttle = ReadPref("throttle", 100);
 	speedup_throttle = ReadPref("speedupThrottle", 100);
 	speedup_frame_skip = ReadPref("speedupFrameSkip", 9);
 	speedup_throttle_frame_skip = ReadPref("speedupThrottleFrameSkip", 0);
-	tripleBuffering = ReadPref("tripleBuffering", 0);
 	useBios = ReadPrefHex("useBiosGBA");
-	useBiosFileGB = ReadPref("useBiosGB", 0);
-	useBiosFileGBA = ReadPref("useBiosGBA", 0);
-	useBiosFileGBC = ReadPref("useBiosGBC", 0);
-	videoOption = ReadPref("video", 2); // VIDEO_3X = 2
-	vsync = ReadPref("vsync", false);
-	windowHeight = ReadPref("windowHeight", 0);
-	windowMaximized = ReadPref("windowMaximized", 0);
-	windowPositionX = ReadPref("windowX", -1);
-	windowPositionY = ReadPref("windowY", -1);
-	windowWidth = ReadPref("windowWidth", 0);
-	winGbBorderOn = ReadPref("borderOn", 0);
 	winGbPrinterEnabled = ReadPref("gbPrinter", 0);
 
 	int soundQuality = (ReadPrefHex("soundQuality", 1));
@@ -972,7 +756,6 @@ int ReadOpts(int argc, char ** argv)
 			break;
 		case 'F':
 			fullScreen = 1;
-			mouseCounter = 120;
 			break;
 		case 'f':
 			if (optarg) {
@@ -1084,20 +867,6 @@ int ReadOpts(int argc, char ** argv)
 			}
 			break;
 
-		case OPT_VIDEO_OPTION:
-			// --video-option
-			if (optarg) {
-				videoOption = atoi(optarg);
-			}
-			break;
-
-		case OPT_LANGUAGE_OPTION:
-			// --language-option
-			if (optarg) {
-				languageOption = atoi(optarg);
-			}
-			break;
-
 		case OPT_GB_FRAME_SKIP:
 			// --gb-frame-skip
 			if (optarg) {
@@ -1105,55 +874,6 @@ int ReadOpts(int argc, char ** argv)
 			}
 			break;
 
-		case OPT_FS_ADAPTER:
-			// --fs-adapter
-			if (optarg) {
-				fsAdapter = atoi(optarg);
-			}
-			break;
-
-		case OPT_FS_WIDTH:
-			// --fs-width
-			if (optarg) {
-				fsWidth = atoi(optarg);
-			}
-			break;
-
-		case OPT_FS_HEIGHT:
-			// --fs-height
-			if (optarg) {
-				fsHeight = atoi(optarg);
-			}
-			break;
-
-		case OPT_FS_COLOR_DEPTH:
-			// --fs-color-depth
-			if (optarg) {
-				fsColorDepth = atoi(optarg);
-			}
-			break;
-
-		case OPT_FS_FREQUENCY:
-			// --fs-frequency
-			if (optarg) {
-				fsFrequency = atoi(optarg);
-			}
-			break;
-
-		case OPT_WINDOW_POSITION_X:
-			// --window-position-x
-			if (optarg) {
-				windowPositionX = atoi(optarg);
-			}
-			break;
-
-		case OPT_WINDOW_POSITION_Y:
-			// --window-position-y
-			if (optarg) {
-				windowPositionY = atoi(optarg);
-			}
-			break;
-
 		case OPT_SOUND_FILTERING:
 			// --sound-filtering
 			if (optarg) {
@@ -1161,13 +881,6 @@ int ReadOpts(int argc, char ** argv)
 			}
 			break;
 
-		case OPT_GL_FILTER:
-			// --gl-filter
-			if (optarg) {
-				glFilter = atoi(optarg);
-			}
-			break;
-
 		case OPT_SHOW_SPEED:
 			// --show-speed
 			if (optarg) {
@@ -1189,13 +902,6 @@ int ReadOpts(int argc, char ** argv)
 			}
 			break;
 
-		case OPT_THREAD_PRIORITY:
-			// --thread-priority
-			if (optarg) {
-				threadPriority = atoi(optarg);
-			}
-			break;
-
 		case OPT_GB_PALETTE_OPTION:
 			// --gb-palette-option
 			if (optarg) {
@@ -1210,62 +916,6 @@ int ReadOpts(int argc, char ** argv)
 			}
 			break;
 
-		case OPT_JOYPAD_DEFAULT:
-			// --joypad-default
-			if (optarg) {
-				joypadDefault = atoi(optarg);
-			}
-			break;
-
-		case OPT_MAX_SCALE:
-			// --max-scale
-			if (optarg) {
-				maxScale = atoi(optarg);
-			}
-			break;
-
-		case OPT_LINK_TIMEOUT:
-			// --link-timeout
-			if (optarg) {
-				linkTimeout = atoi(optarg);
-			}
-			break;
-
-		case OPT_LINK_MODE:
-			// --link-mode
-			if (optarg) {
-				linkMode = atoi(optarg);
-			}
-			break;
-
-		case OPT_LINK_AUTO:
-			// --link-auto
-			if (optarg) {
-				linkAuto = atoi(optarg);
-			}
-			break;
-
-		case OPT_LINK_HACKS:
-			// --link-hacks
-			if (optarg) {
-				linkHacks = atoi(optarg);
-			}
-			break;
-
-		case OPT_LINK_NUM_PLAYERS:
-			// --link-num-players
-			if (optarg) {
-				linkNumPlayers = atoi(optarg);
-			}
-			break;
-
-		case OPT_GDB_PORT:
-			// --gdb-port
-			if (optarg) {
-				gdbPort = atoi(optarg);
-			}
-			break;
-
 		case OPT_BIOS_FILE_NAME_GB:
 			// --bios-file-name-gb
 			biosFileNameGB = optarg;
@@ -1281,21 +931,6 @@ int ReadOpts(int argc, char ** argv)
 			biosFileNameGBC = optarg;
 			break;
 
-		case OPT_AVI_RECORD_DIR:
-			// --avi-record-dir
-			aviRecordDir = optarg;
-			break;
-
-		case OPT_MOVIE_RECORD_DIR:
-			// --movie-record-dir
-			movieRecordDir = optarg;
-			break;
-
-		case OPT_SOUND_RECORD_DIR:
-			// --sound-record-dir
-			soundRecordDir = optarg;
-			break;
-
 		case OPT_SCREEN_SHOT_DIR:
 			// --screen-shot-dir
 			screenShotDir = optarg;
@@ -1311,26 +946,6 @@ int ReadOpts(int argc, char ** argv)
 			batteryDir = optarg;
 			break;
 
-		case OPT_ROM_DIR_GBC:
-			// --rom-dir-gbc
-			romDirGBC = optarg;
-			break;
-
-		case OPT_ROM_DIR_GB:
-			// --rom-dir-gb
-			romDirGB = optarg;
-			break;
-
-		case OPT_ROM_DIR_GBA:
-			// --rom-dir-gba
-			romDirGBA = optarg;
-			break;
-
-		case OPT_LINK_HOST_ADDR:
-			// --link-host-addr
-			linkHostAddr = optarg;
-			break;
-
 		case OPT_CPU_SAVE_TYPE:
 			// --cpu-save-type
 			if (optarg) {
@@ -1347,20 +962,6 @@ int ReadOpts(int argc, char ** argv)
 			}
 			break;
 
-		case OPT_WINDOW_HEIGHT:
-			// --window-height
-			if (optarg) {
-				windowHeight = atoi(optarg);
-			}
-			break;
-
-		case OPT_WINDOW_WIDTH:
-			// --window-width
-			if (optarg) {
-				windowWidth = atoi(optarg);
-			}
-			break;
-
 		case OPT_DOTCODE_FILE_NAME_LOAD:
 			// --dotcode-file-name-load
 			loadDotCodeFile = optarg;
diff --git a/src/common/ConfigManager.h b/src/common/ConfigManager.h
index 54ee25b5..4dd8f36d 100644
--- a/src/common/ConfigManager.h
+++ b/src/common/ConfigManager.h
@@ -25,127 +25,41 @@ extern bool mirroringEnable;
 extern bool parseDebug;
 extern bool speedHack;
 extern bool speedup;
-extern bool gbaLcdFilter;
-extern bool gbLcdFilter;
-extern char *rewindMemory;
-extern const char *aviRecordDir;
 extern const char *biosFileNameGB;
 extern const char *biosFileNameGBA;
 extern const char *biosFileNameGBC;
 extern const char *loadDotCodeFile;
 extern const char *saveDotCodeFile;
-extern const char *linkHostAddr;
-extern const char *movieRecordDir;
-extern const char *romDirGB;
-extern const char *romDirGBA;
-extern const char *romDirGBC;
-extern const char *soundRecordDir;
-extern int *rewindSerials;
-extern int active;
 extern int agbPrint;
-extern int autoFire;
 extern int autoFireMaxCount;
-extern int autoFireToggle;
 extern int autoFrameSkip;
-extern int autoLoadMostRecent;
 extern int autoPatch;
-extern int autoSaveLoadCheatList;
-extern int aviRecording;
 extern int captureFormat;
 extern int cheatsEnabled;
 extern int colorizerHack;
 extern int cpuDisableSfx;
 extern int cpuSaveType;
-extern int dinputKeyFocus;
-extern int enableMMX;
 extern int disableStatusMessages;
-extern int dsoundDisableHardwareAcceleration;
-extern int filterHeight;
-extern int filterMagnification;
-extern int filterMT; // enable multi-threading for pixel filters
 extern int filter;
-extern int filterWidth;
 extern int frameSkip;
-extern int frameskipadjust;
-extern int fsAdapter;
-extern int fsColorDepth;
-extern int fsForceChange;
-extern int fsFrequency;
-extern int fsHeight;
-extern int fsWidth;
 extern int fullScreen;
-extern int fullScreenStretch;
-extern int gdbBreakOnLoad;
-extern int gdbPort;
-extern int glFilter;
 extern int ifbType;
-extern int joypadDefault;
-extern int languageOption;
 extern int layerEnable;
 extern int layerSettings;
-extern int linkAuto;
-extern int linkHacks;
-extern int linkMode;
-extern int linkNumPlayers;
-extern int linkTimeout;
-extern int maxScale;
-extern int movieFrame;
-extern int moviePlayFrame;
-extern int moviePlaying;
-extern int movieRecording;
 extern int openGL;
-extern int autoPatch;
 extern int optFlashSize;
 extern int optPrintUsage;
-extern int paused;
 extern int pauseWhenInactive;
-extern int recentFreeze;
-extern int renderedFrames;
-extern int rewindCount;
-extern int rewindCounter;
-extern int rewindPos;
-extern int rewindSaveNeeded;
 extern int rewindTimer;
-extern int rewindTopPos;
-// extern int romSize;
 extern int rtcEnabled;
 extern int saveType;
-extern int screenMessage;
-extern int sensorX;
-extern int sensorY;
-extern int showRenderedFrames;
 extern int showSpeed;
 extern int showSpeedTransparent;
-extern int sizeX;
-extern int sizeY;
 extern int skipBios;
 extern int skipSaveGameBattery;
 extern int skipSaveGameCheats;
-extern int soundRecording;
-extern int speedupToggle;
-extern int sunBars;
-extern int surfaceSizeX;
-extern int surfaceSizeY;
-extern int threadPriority;
-extern int tripleBuffering;
 extern int useBios;
-extern int useBiosFileGB;
-extern int useBiosFileGBA;
-extern int useBiosFileGBC;
-extern int videoOption;
-extern int vsync;
-extern int wasPaused;
-extern uint32_t windowHeight;
-extern int windowMaximized;
-extern int windowPositionX;
-extern int windowPositionY;
-extern uint32_t windowWidth;
-extern int winGbBorderOn;
 extern int winGbPrinterEnabled;
-extern int winPauseNextFrame;
-extern uint32_t autoFrameSkipLastTime;
-extern uint32_t movieLastJoypad;
-extern uint32_t movieNextJoypad;
 extern uint32_t throttle;
 extern uint32_t speedup_throttle;
 extern uint32_t speedup_frame_skip;
@@ -161,12 +75,6 @@ extern const char *preparedCheatCodes[MAX_CHEATS];
 extern int patchNum;
 extern char *patchNames[PATCH_MAX_NUM]; // and so on
 
-extern int mouseCounter;
-
-extern FilterFunc filterFunction;
-extern IFBFilterFunc ifbFunction;
-
-extern char *homeDir;
 extern const char *screenShotDir;
 extern const char *saveDir;
 extern const char *batteryDir;
diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp
index 4e128180..a9b699d8 100644
--- a/src/sdl/SDL.cpp
+++ b/src/sdl/SDL.cpp
@@ -139,13 +139,31 @@ int systemGreenShift = 0;
 int systemColorDepth = 0;
 int systemVerbose = 0;
 int systemFrameSkip = 0;
+int frameskipadjust = 0;
 int systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED;
+int renderedFrames = 0;
+int showRenderedFrames = 0;
+int mouseCounter = 0;
+uint32_t autoFrameSkipLastTime = 0;
+
+char* rewindMemory = NULL;
+int rewindCount;
+int rewindCounter;
+int rewindPos;
+int rewindSaveNeeded = 0;
+int rewindTopPos;
+int* rewindSerials = NULL;
 
 int srcPitch = 0;
 int destWidth = 0;
 int destHeight = 0;
 int desktopWidth = 0;
 int desktopHeight = 0;
+int sizeX = 240;
+int sizeY = 160;
+
+FilterFunc filterFunction = 0;
+IFBFilterFunc ifbFunction = 0;
 
 uint8_t* delta = NULL;
 static const int delta_size = 322 * 242 * 4;
@@ -207,6 +225,8 @@ enum VIDEO_SIZE {
 
 uint32_t throttleLastTime = 0;
 
+bool paused = false;
+bool wasPaused = false;
 bool pauseNextFrame = false;
 int sdlMirroringEnable = 1;
 
@@ -219,6 +239,7 @@ char* home;
 char homeConfigDir[1024];
 char homeDataDir[1024];
 
+bool screenMessage = false;
 char screenMessageBuffer[21];
 uint32_t screenMessageTime = 0;
 
@@ -1023,7 +1044,7 @@ void sdlPollEvents()
                 if (pauseWhenInactive)
                     if (paused) {
                         if (emulating) {
-                            paused = 0;
+                            paused = false;
                             soundResume();
                         }
                     }
@@ -1032,7 +1053,7 @@ void sdlPollEvents()
                 if (pauseWhenInactive) {
                     wasPaused = true;
                     if (emulating) {
-                        paused = 1;
+                        paused = true;
                         soundPause();
                     }
 
@@ -1548,6 +1569,14 @@ int main(int argc, char** argv)
     gb_effects_config.enabled = false;
 
     LoadConfig(); // Parse command line arguments (overrides ini)
+
+    // Additional configuration.
+	if (rewindTimer) {
+		rewindMemory = (char *)malloc(REWIND_NUM*REWIND_SIZE);
+		rewindSerials = (int *)calloc(REWIND_NUM, sizeof(int)); // init to zeroes
+	}
+
+
     ReadOpts(argc, argv);
 
     inputSetKeymap(PAD_1, KEY_LEFT, ReadPrefHex("Joy0_Left"));
@@ -1858,7 +1887,7 @@ int main(int argc, char** argv)
     }
 
     while (emulating) {
-        if (!paused && active) {
+        if (!paused) {
             if (debugger && emulator.emuHasDebugger)
                 remoteStubMain();
             else {
diff --git a/src/sdl/inputSDL.cpp b/src/sdl/inputSDL.cpp
index 4d3d961c..680db862 100644
--- a/src/sdl/inputSDL.cpp
+++ b/src/sdl/inputSDL.cpp
@@ -48,7 +48,11 @@ static SDL_Joystick** sdlDevices = NULL;
 
 static EPad sdlDefaultJoypad = PAD_MAIN;
 
+static int autoFire = 0;
+static int autoFireToggle = 0;
 static int autoFireCountdown = 0;
+static int sensorX = 0;
+static int sensorY = 0;
 
 static uint32_t joypad[5][SDLBUTTONS_NUM] = {
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
diff --git a/src/wx/cmdevents.cpp b/src/wx/cmdevents.cpp
index 565c131f..82879197 100644
--- a/src/wx/cmdevents.cpp
+++ b/src/wx/cmdevents.cpp
@@ -234,7 +234,7 @@ EVT_HANDLER(wxID_FILE1, "Load recent ROM 1")
     panel->LoadGame(gopts.recent->GetHistoryFile(0));
 
 #ifndef NO_DEBUGGER
-    if (gdbBreakOnLoad)
+    if (gopts.gdb_break_on_load)
         GDBBreak();
 #endif
 }
@@ -244,7 +244,7 @@ EVT_HANDLER(wxID_FILE2, "Load recent ROM 2")
     panel->LoadGame(gopts.recent->GetHistoryFile(1));
 
 #ifndef NO_DEBUGGER
-    if (gdbBreakOnLoad)
+    if (gopts.gdb_break_on_load)
         GDBBreak();
 #endif
 }
@@ -254,7 +254,7 @@ EVT_HANDLER(wxID_FILE3, "Load recent ROM 3")
     panel->LoadGame(gopts.recent->GetHistoryFile(2));
 
 #ifndef NO_DEBUGGER
-    if (gdbBreakOnLoad)
+    if (gopts.gdb_break_on_load)
         GDBBreak();
 #endif
 }
@@ -264,7 +264,7 @@ EVT_HANDLER(wxID_FILE4, "Load recent ROM 4")
     panel->LoadGame(gopts.recent->GetHistoryFile(3));
 
 #ifndef NO_DEBUGGER
-    if (gdbBreakOnLoad)
+    if (gopts.gdb_break_on_load)
         GDBBreak();
 #endif
 }
@@ -274,7 +274,7 @@ EVT_HANDLER(wxID_FILE5, "Load recent ROM 5")
     panel->LoadGame(gopts.recent->GetHistoryFile(4));
 
 #ifndef NO_DEBUGGER
-    if (gdbBreakOnLoad)
+    if (gopts.gdb_break_on_load)
         GDBBreak();
 #endif
 }
@@ -284,7 +284,7 @@ EVT_HANDLER(wxID_FILE6, "Load recent ROM 6")
     panel->LoadGame(gopts.recent->GetHistoryFile(5));
 
 #ifndef NO_DEBUGGER
-    if (gdbBreakOnLoad)
+    if (gopts.gdb_break_on_load)
         GDBBreak();
 #endif
 }
@@ -294,7 +294,7 @@ EVT_HANDLER(wxID_FILE7, "Load recent ROM 7")
     panel->LoadGame(gopts.recent->GetHistoryFile(6));
 
 #ifndef NO_DEBUGGER
-    if (gdbBreakOnLoad)
+    if (gopts.gdb_break_on_load)
         GDBBreak();
 #endif
 }
@@ -304,7 +304,7 @@ EVT_HANDLER(wxID_FILE8, "Load recent ROM 8")
     panel->LoadGame(gopts.recent->GetHistoryFile(7));
 
 #ifndef NO_DEBUGGER
-    if (gdbBreakOnLoad)
+    if (gopts.gdb_break_on_load)
         GDBBreak();
 #endif
 }
@@ -314,7 +314,7 @@ EVT_HANDLER(wxID_FILE9, "Load recent ROM 9")
     panel->LoadGame(gopts.recent->GetHistoryFile(8));
 
 #ifndef NO_DEBUGGER
-    if (gdbBreakOnLoad)
+    if (gopts.gdb_break_on_load)
         GDBBreak();
 #endif
 }
@@ -324,7 +324,7 @@ EVT_HANDLER(wxID_FILE10, "Load recent ROM 10")
     panel->LoadGame(gopts.recent->GetHistoryFile(9));
 
 #ifndef NO_DEBUGGER
-    if (gdbBreakOnLoad)
+    if (gopts.gdb_break_on_load)
         GDBBreak();
 #endif
 }
@@ -1998,10 +1998,10 @@ EVT_HANDLER(CheatsEnable, "Enable cheats (toggle)")
 
 EVT_HANDLER(ColorizerHack, "Enable Colorizer Hack (toggle)")
 {
-    int val = 0;
-    GetMenuOptionInt("ColorizerHack", &val, 1);
+    bool val = false;
+    GetMenuOptionBool("ColorizerHack", &val);
 
-    if (val == 1 && useBiosFileGB == 1) {
+    if (val && gopts.use_bios_file_gb) {
         wxLogError(_("Cannot use Colorizer Hack when GB BIOS File is enabled."));
         val = 0;
         SetMenuOption("ColorizerHack", 0);
@@ -2322,7 +2322,7 @@ int GetGDBPort(MainFrame* mf)
         _("Set to 0 for pseudo tty"),
 #endif
         _("Port to wait for connection:"),
-        _("GDB Connection"), gdbPort,
+        _("GDB Connection"), gopts.gdb_port,
 #ifdef __WXMSW__
         1025,
 #else
@@ -2338,7 +2338,7 @@ EVT_HANDLER(DebugGDBPort, "Configure port...")
     int port_selected = GetGDBPort(this);
 
     if (port_selected != -1) {
-        gdbPort = port_selected;
+        gopts.gdb_port = port_selected;
         update_opts();
     }
 #endif
@@ -2347,7 +2347,7 @@ EVT_HANDLER(DebugGDBPort, "Configure port...")
 EVT_HANDLER(DebugGDBBreakOnLoad, "Break on load")
 {
 #ifndef NO_DEBUGGER
-    GetMenuOptionInt("DebugGDBBreakOnLoad", &gdbBreakOnLoad, 1);
+    GetMenuOptionBool("DebugGDBBreakOnLoad", &gopts.gdb_break_on_load);
     update_opts();
 #endif
 }
@@ -2357,21 +2357,21 @@ void MainFrame::GDBBreak()
 {
     ModalPause mp;
 
-    if (gdbPort == 0) {
+    if (gopts.gdb_port == 0) {
         int port_selected = GetGDBPort(this);
 
         if (port_selected != -1) {
-            gdbPort = port_selected;
+            gopts.gdb_port = port_selected;
             update_opts();
         }
     }
 
-    if (gdbPort > 0) {
+    if (gopts.gdb_port > 0) {
         if (!remotePort) {
             wxString msg;
 #ifndef __WXMSW__
 
-            if (!gdbPort) {
+            if (!gopts.gdb_port) {
                 if (!debugOpenPty())
                     return;
 
@@ -2379,10 +2379,10 @@ void MainFrame::GDBBreak()
             } else
 #endif
             {
-                if (!debugStartListen(gdbPort))
+                if (!debugStartListen(gopts.gdb_port))
                     return;
 
-                msg.Printf(_("Waiting for connection on port %d"), gdbPort);
+                msg.Printf(_("Waiting for connection on port %d"), gopts.gdb_port);
             }
 
             wxProgressDialog dlg(_("Waiting for GDB..."), msg, 100, this,
@@ -2392,7 +2392,7 @@ void MainFrame::GDBBreak()
             while (dlg.Pulse()) {
 #ifndef __WXMSW__
 
-                if (!gdbPort)
+                if (!gopts.gdb_port)
                     connected = debugWaitPty();
                 else
 #endif
@@ -2406,7 +2406,7 @@ void MainFrame::GDBBreak()
             }
 
             if (connected) {
-                remotePort = gdbPort;
+                remotePort = gopts.gdb_port;
                 emulating = 1;
                 dbgMain = remoteStubMain;
                 dbgSignal = remoteStubSignal;
@@ -3043,9 +3043,9 @@ EVT_HANDLER_MASK(GBALcdFilter, "Enable LCD filter", CMDEN_GBA)
 {
     bool menuPress = false;
     GetMenuOptionBool("GBALcdFilter", &menuPress);
-    toggleBooleanVar(&menuPress, &gbaLcdFilter);
-    SetMenuOption("GBALcdFilter", gbaLcdFilter ? 1 : 0);
-    utilUpdateSystemColorMaps(gbaLcdFilter);
+    toggleBooleanVar(&menuPress, &gopts.gba_lcd_filter);
+    SetMenuOption("GBALcdFilter", gopts.gba_lcd_filter ? 1 : 0);
+    utilUpdateSystemColorMaps(gopts.gba_lcd_filter);
     update_opts();
 }
 
@@ -3053,9 +3053,9 @@ EVT_HANDLER_MASK(GBLcdFilter, "Enable LCD filter", CMDEN_GB)
 {
     bool menuPress = false;
     GetMenuOptionBool("GBLcdFilter", &menuPress);
-    toggleBooleanVar(&menuPress, &gbLcdFilter);
-    SetMenuOption("GBLcdFilter", gbLcdFilter ? 1 : 0);
-    utilUpdateSystemColorMaps(gbLcdFilter);
+    toggleBooleanVar(&menuPress, &gopts.gb_lcd_filter);
+    SetMenuOption("GBLcdFilter", gopts.gb_lcd_filter ? 1 : 0);
+    utilUpdateSystemColorMaps(gopts.gb_lcd_filter);
     update_opts();
 }
 
@@ -3076,14 +3076,6 @@ EVT_HANDLER(ApplyPatches, "Apply IPS/UPS/IPF patches if found")
     update_opts();
 }
 
-EVT_HANDLER(MMX, "Enable MMX")
-{
-#ifdef MMX
-    GetMenuOptionInt("MMX", &enableMMX, 1);
-    update_opts();
-#endif
-}
-
 EVT_HANDLER(KeepOnTop, "Keep window on top")
 {
     GetMenuOptionBool("KeepOnTop", &gopts.keep_on_top);
@@ -3099,7 +3091,7 @@ EVT_HANDLER(KeepOnTop, "Keep window on top")
 
 EVT_HANDLER(StatusBar, "Enable status bar")
 {
-    GetMenuOptionInt("StatusBar", &gopts.statusbar, 1);
+    GetMenuOptionBool("StatusBar", &gopts.statusbar);
     update_opts();
     MainFrame* mf = wxGetApp().frame;
 
@@ -3125,11 +3117,6 @@ EVT_HANDLER(FrameSkipAuto, "Auto Skip frames.")
     update_opts();
 }
 
-EVT_HANDLER(Fullscreen, "Enter fullscreen mode at startup")
-{
-    GetMenuOptionConfig("Fullscreen", config::OptionID::kGeomFullScreen);
-}
-
 EVT_HANDLER(PauseWhenInactive, "Pause game when main window loses focus")
 {
     GetMenuOptionInt("PauseWhenInactive", &pauseWhenInactive, 1);
@@ -3156,7 +3143,7 @@ EVT_HANDLER(SkipIntro, "Skip BIOS initialization")
 
 EVT_HANDLER(BootRomEn, "Use the specified BIOS file for GBA")
 {
-    GetMenuOptionInt("BootRomEn", &useBiosFileGBA, 1);
+    GetMenuOptionBool("BootRomEn", &gopts.use_bios_file_gba);
     update_opts();
 }
 
@@ -3171,20 +3158,20 @@ EVT_HANDLER(BootRomGB, "Use the specified BIOS file for GB")
         SetMenuOption("BootRomGB", 0);
     }
 
-    useBiosFileGB = val;
+    gopts.use_bios_file_gb = val;
 
     update_opts();
 }
 
 EVT_HANDLER(BootRomGBC, "Use the specified BIOS file for GBC")
 {
-    GetMenuOptionInt("BootRomGBC", &useBiosFileGBC, 1);
+    GetMenuOptionBool("BootRomGBC", &gopts.use_bios_file_gbc);
     update_opts();
 }
 
 EVT_HANDLER(VSync, "Wait for vertical sync")
 {
-    GetMenuOptionInt("VSync", &vsync, 1);
+    GetMenuOptionBool("VSync", &gopts.vsync);
     update_opts();
     panel->ResetPanel();
 }
@@ -3276,13 +3263,13 @@ EVT_HANDLER(LinkAuto, "Enable link at boot")
 
 EVT_HANDLER(SpeedOn, "Enable faster network protocol by default")
 {
-    GetMenuOptionInt("SpeedOn", &linkHacks, 1);
+    GetMenuOptionBool("SpeedOn", &gopts.link_hacks);
     update_opts();
 }
 
 EVT_HANDLER(LinkProto, "Local host IPC")
 {
-    GetMenuOptionInt("LinkProto", &gopts.link_proto, 1);
+    GetMenuOptionBool("LinkProto", &gopts.link_proto);
     update_opts();
     enable_menus();
     EnableNetworkMenu();
@@ -3296,7 +3283,7 @@ EVT_HANDLER(LinkConfigure, "Link options...")
     if (ShowModal(dlg) != wxID_OK)
         return;
 
-    SetLinkTimeout(linkTimeout);
+    SetLinkTimeout(gopts.link_timeout);
     update_opts();
     EnableNetworkMenu();
 #endif
diff --git a/src/wx/config/internal/option-internal.cpp b/src/wx/config/internal/option-internal.cpp
index 48705f55..cc3d1021 100644
--- a/src/wx/config/internal/option-internal.cpp
+++ b/src/wx/config/internal/option-internal.cpp
@@ -152,6 +152,11 @@ std::array<Option, kNbOptions>& Option::All() {
 #else
         RenderMethod render_method = RenderMethod::kOpenGL;
 #endif
+        bool window_maximized = false;
+        uint32_t window_height = 0;
+        uint32_t window_width = 0;
+        int window_pos_x = -1;
+        int window_pos_y = -1;
     };
     static OwnedOptions g_owned_opts;
 
@@ -176,7 +181,7 @@ std::array<Option, kNbOptions>& Option::All() {
         Option(OptionID::kGBBiosFile, &gopts.gb_bios),
         Option(OptionID::kGBColorOption, &gbColorOption, 0, 1),
         Option(OptionID::kGBColorizerHack, &colorizerHack, 0, 1),
-        Option(OptionID::kGBLCDFilter, &gbLcdFilter),
+        Option(OptionID::kGBLCDFilter, &gopts.gb_lcd_filter),
         Option(OptionID::kGBGBCBiosFile, &gopts.gbc_bios),
         Option(OptionID::kGBPalette0, systemGbPalette),
         Option(OptionID::kGBPalette1, systemGbPalette + 8),
@@ -188,15 +193,15 @@ std::array<Option, kNbOptions>& Option::All() {
 
         /// GBA
         Option(OptionID::kGBABiosFile, &gopts.gba_bios),
-        Option(OptionID::kGBALCDFilter, &gbaLcdFilter),
+        Option(OptionID::kGBALCDFilter, &gopts.gba_lcd_filter),
 #ifndef NO_LINK
         Option(OptionID::kGBALinkAuto, &gopts.link_auto),
-        Option(OptionID::kGBALinkFast, &linkHacks, 0, 1),
+        Option(OptionID::kGBALinkFast, &gopts.link_hacks),
         Option(OptionID::kGBALinkHost, &gopts.link_host),
         Option(OptionID::kGBAServerIP, &gopts.server_ip),
         Option(OptionID::kGBALinkPort, &gopts.link_port, 0, 65535),
-        Option(OptionID::kGBALinkProto, &gopts.link_proto, 0, 1),
-        Option(OptionID::kGBALinkTimeout, &linkTimeout, 0, 9999999),
+        Option(OptionID::kGBALinkProto, &gopts.link_proto),
+        Option(OptionID::kGBALinkTimeout, &gopts.link_timeout, 0, 9999999),
         Option(OptionID::kGBALinkType, &gopts.gba_link_type, 0, 5),
 #endif
         Option(OptionID::kGBAROMDir, &gopts.gba_rom_dir),
@@ -210,7 +215,7 @@ std::array<Option, kNbOptions>& Option::All() {
                600),
         Option(OptionID::kGenScreenshotDir, &gopts.scrshot_dir),
         Option(OptionID::kGenStateDir, &gopts.state_dir),
-        Option(OptionID::kGenStatusBar, &gopts.statusbar, 0, 1),
+        Option(OptionID::kGenStatusBar, &gopts.statusbar),
 
         /// Joypad
         Option(OptionID::kJoy),
@@ -225,32 +230,24 @@ std::array<Option, kNbOptions>& Option::All() {
         Option(OptionID::kPrefAgbPrint, &agbPrint, 0, 1),
         Option(OptionID::kPrefAutoFrameSkip, &autoFrameSkip, 0, 1),
         Option(OptionID::kPrefAutoPatch, &autoPatch, 0, 1),
-        Option(OptionID::kPrefAutoSaveLoadCheatList,
-               &gopts.autoload_cheats),
+        Option(OptionID::kPrefAutoSaveLoadCheatList, &gopts.autoload_cheats),
         Option(OptionID::kPrefBorderAutomatic, &gbBorderAutomatic, 0, 1),
         Option(OptionID::kPrefBorderOn, &gbBorderOn, 0, 1),
         Option(OptionID::kPrefCaptureFormat, &captureFormat, 0, 1),
         Option(OptionID::kPrefCheatsEnabled, &cheatsEnabled, 0, 1),
-#ifdef MMX
-        Option(OptionID::kPrefEnableMMX, &enableMMX, 0, 1),
-#endif
         Option(OptionID::kPrefDisableStatus, &disableStatusMessages, 0,
                1),
         Option(OptionID::kPrefEmulatorType, &gbEmulatorType, 0, 5),
         Option(OptionID::kPrefFlashSize, &optFlashSize, 0, 1),
         Option(OptionID::kPrefFrameSkip, &frameSkip, -1, 9),
-        Option(OptionID::kPrefFsColorDepth, &fsColorDepth, 0, 999),
-        Option(OptionID::kPrefFsFrequency, &fsFrequency, 0, 999),
-        Option(OptionID::kPrefFsHeight, &fsHeight, 0, 99999),
-        Option(OptionID::kPrefFsWidth, &fsWidth, 0, 99999),
         Option(OptionID::kPrefGBPaletteOption, &gbPaletteOption, 0, 2),
         Option(OptionID::kPrefGBPrinter, &winGbPrinterEnabled, 0, 1),
-        Option(OptionID::kPrefGDBBreakOnLoad, &gdbBreakOnLoad, 0, 1),
-        Option(OptionID::kPrefGDBPort, &gdbPort, 0, 65535),
+        Option(OptionID::kPrefGDBBreakOnLoad, &gopts.gdb_break_on_load),
+        Option(OptionID::kPrefGDBPort, &gopts.gdb_port, 0, 65535),
 #ifndef NO_LINK
-        Option(OptionID::kPrefLinkNumPlayers, &linkNumPlayers, 2, 4),
+        Option(OptionID::kPrefLinkNumPlayers, &gopts.link_num_players, 2, 4),
 #endif
-        Option(OptionID::kPrefMaxScale, &maxScale, 0, 100),
+        Option(OptionID::kPrefMaxScale, &gopts.max_scale, 0, 100),
         Option(OptionID::kPrefPauseWhenInactive, &pauseWhenInactive, 0,
                1),
         Option(OptionID::kPrefRTCEnabled, &rtcEnabled, 0, 1),
@@ -270,18 +267,18 @@ std::array<Option, kNbOptions>& Option::All() {
                300),
         Option(OptionID::kPrefSpeedupThrottleFrameSkip,
                &speedup_throttle_frame_skip),
-        Option(OptionID::kPrefUseBiosGB, &useBiosFileGB, 0, 1),
-        Option(OptionID::kPrefUseBiosGBA, &useBiosFileGBA, 0, 1),
-        Option(OptionID::kPrefUseBiosGBC, &useBiosFileGBC, 0, 1),
-        Option(OptionID::kPrefVsync, &vsync, 0, 1),
+        Option(OptionID::kPrefUseBiosGB, &gopts.use_bios_file_gb),
+        Option(OptionID::kPrefUseBiosGBA, &gopts.use_bios_file_gba),
+        Option(OptionID::kPrefUseBiosGBC, &gopts.use_bios_file_gbc),
+        Option(OptionID::kPrefVsync, &gopts.vsync),
 
         /// Geometry
         Option(OptionID::kGeomFullScreen, &fullScreen, 0, 1),
-        Option(OptionID::kGeomIsMaximized, &windowMaximized, 0, 1),
-        Option(OptionID::kGeomWindowHeight, &windowHeight, 0, 99999),
-        Option(OptionID::kGeomWindowWidth, &windowWidth, 0, 99999),
-        Option(OptionID::kGeomWindowX, &windowPositionX, -1, 99999),
-        Option(OptionID::kGeomWindowY, &windowPositionY, -1, 99999),
+        Option(OptionID::kGeomIsMaximized, &g_owned_opts.window_maximized),
+        Option(OptionID::kGeomWindowHeight, &g_owned_opts.window_height, 0, 99999),
+        Option(OptionID::kGeomWindowWidth, &g_owned_opts.window_width, 0, 99999),
+        Option(OptionID::kGeomWindowX, &g_owned_opts.window_pos_x, -1, 99999),
+        Option(OptionID::kGeomWindowY, &g_owned_opts.window_pos_y, -1, 99999),
 
         /// UI
         Option(OptionID::kUIAllowKeyboardBackgroundInput,
@@ -382,7 +379,7 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
                Option::Type::kBool},
     OptionData{"GBA/LinkFast", "SpeedOn",
                _("Enable faster network protocol by default"),
-               Option::Type::kInt},
+               Option::Type::kBool},
     OptionData{"GBA/LinkHost", "", _("Default network link client host"),
                Option::Type::kString},
     OptionData{"GBA/ServerIP", "", _("Default network link server IP to bind"),
@@ -391,7 +388,7 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
                _("Default network link port (server and client)"),
                Option::Type::kUnsigned},
     OptionData{"GBA/LinkProto", "LinkProto", _("Default network protocol"),
-               Option::Type::kInt},
+               Option::Type::kBool},
     OptionData{"GBA/LinkTimeout", "LinkTimeout", _("Link timeout (ms)"),
                Option::Type::kInt},
     OptionData{"GBA/LinkType", "LinkType", _("Link cable type"),
@@ -425,7 +422,7 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
                  "relative to BatteryDir)"),
                Option::Type::kString},
     OptionData{"General/StatusBar", "StatusBar", _("Enable status bar"),
-               Option::Type::kInt},
+               Option::Type::kBool},
 
     /// Joypad
     OptionData{"Joypad/*/*", "",
@@ -468,10 +465,6 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
                Option::Type::kInt},
     OptionData{"preferences/cheatsEnabled", "", _("Enable cheats"),
                Option::Type::kInt},
-#ifdef MMX
-    OptionData{"preferences/enableMMX", "MMX", _("Enable MMX"),
-               Option::Type::kInt},
-#endif
     OptionData{"preferences/disableStatus", "NoStatusMsg",
                _("Disable on-screen status messages"), Option::Type::kInt},
     OptionData{"preferences/emulatorType", "", _("Type of system to emulate"),
@@ -482,20 +475,12 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
                _("Skip frames.  Values are 0-9 or -1 to skip automatically "
                  "based on time."),
                Option::Type::kInt},
-    OptionData{"preferences/fsColorDepth", "",
-               _("Fullscreen mode color depth (0 = any)"), Option::Type::kInt},
-    OptionData{"preferences/fsFrequency", "",
-               _("Fullscreen mode frequency (0 = any)"), Option::Type::kInt},
-    OptionData{"preferences/fsHeight", "",
-               _("Fullscreen mode height (0 = desktop)"), Option::Type::kInt},
-    OptionData{"preferences/fsWidth", "",
-               _("Fullscreen mode width (0 = desktop)"), Option::Type::kInt},
     OptionData{"preferences/gbPaletteOption", "", _("The palette to use"),
                Option::Type::kInt},
     OptionData{"preferences/gbPrinter", "Printer",
                _("Enable printer emulation"), Option::Type::kInt},
     OptionData{"preferences/gdbBreakOnLoad", "DebugGDBBreakOnLoad",
-               _("Break into GDB after loading the game."), Option::Type::kInt},
+               _("Break into GDB after loading the game."), Option::Type::kBool},
     OptionData{"preferences/gdbPort", "DebugGDBPort",
                _("Port to connect GDB to."), Option::Type::kInt},
 #ifndef NO_LINK
@@ -539,19 +524,19 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
     OptionData{"preferences/speedupThrottleFrameSkip", "",
                _("Use frame skip for speedup throttle"), Option::Type::kBool},
     OptionData{"preferences/useBiosGB", "BootRomGB",
-               _("Use the specified BIOS file for GB"), Option::Type::kInt},
+               _("Use the specified BIOS file for GB"), Option::Type::kBool},
     OptionData{"preferences/useBiosGBA", "BootRomEn",
-               _("Use the specified BIOS file"), Option::Type::kInt},
+               _("Use the specified BIOS file"), Option::Type::kBool},
     OptionData{"preferences/useBiosGBC", "BootRomGBC",
-               _("Use the specified BIOS file for GBC"), Option::Type::kInt},
+               _("Use the specified BIOS file for GBC"), Option::Type::kBool},
     OptionData{"preferences/vsync", "VSync", _("Wait for vertical sync"),
-               Option::Type::kInt},
+               Option::Type::kBool},
 
     /// Geometry
     OptionData{"geometry/fullScreen", "Fullscreen",
                _("Enter fullscreen mode at startup"), Option::Type::kInt},
     OptionData{"geometry/isMaximized", "Maximized", _("Window maximized"),
-               Option::Type::kInt},
+               Option::Type::kBool},
     OptionData{"geometry/windowHeight", "Height", _("Window height at startup"),
                Option::Type::kUnsigned},
     OptionData{"geometry/windowWidth", "Width", _("Window width at startup"),
diff --git a/src/wx/config/option-id.h b/src/wx/config/option-id.h
index 4bc8bf15..1183dd14 100644
--- a/src/wx/config/option-id.h
+++ b/src/wx/config/option-id.h
@@ -72,17 +72,10 @@ enum class OptionID {
     kPrefCaptureFormat,
     kPrefCheatsEnabled,
 
-#ifdef MMX
-    kPrefEnableMMX,
-#endif
     kPrefDisableStatus,
     kPrefEmulatorType,
     kPrefFlashSize,
     kPrefFrameSkip,
-    kPrefFsColorDepth,
-    kPrefFsFrequency,
-    kPrefFsHeight,
-    kPrefFsWidth,
     kPrefGBPaletteOption,
     kPrefGBPrinter,
     kPrefGDBBreakOnLoad,
diff --git a/src/wx/dialogs/display-config.cpp b/src/wx/dialogs/display-config.cpp
index 29408410..5163e7be 100644
--- a/src/wx/dialogs/display-config.cpp
+++ b/src/wx/dialogs/display-config.cpp
@@ -279,7 +279,7 @@ DisplayConfig::DisplayConfig(wxWindow* parent)
     // this was a choice, but I'd rather not have to make an off-by-one
     // validator just for this, and spinctrl is good enough.
     GetValidatedChild(this, "MaxScale")
-        ->SetValidator(wxGenericValidator(&maxScale));
+        ->SetValidator(wxGenericValidator(&gopts.max_scale));
 
     // Basic
     GetValidatedChild(this, "OutputSimple")
diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp
index 0076b0cb..f74800cd 100644
--- a/src/wx/guiinit.cpp
+++ b/src/wx/guiinit.cpp
@@ -124,15 +124,15 @@ public:
             }
         }
 
-        linkNumPlayers = n_players;
+        gopts.link_num_players = n_players;
         update_opts(); // save fast flag and client host
         // Close any previous link
         CloseLink();
         wxString connmsg;
         wxString title;
-        SetLinkTimeout(linkTimeout);
-        EnableSpeedHacks(linkHacks);
-        EnableLinkServer(server, linkNumPlayers - 1);
+        SetLinkTimeout(gopts.link_timeout);
+        EnableSpeedHacks(gopts.link_hacks);
+        EnableLinkServer(server, gopts.link_num_players - 1);
 
         if (server) {
             char host[length];
@@ -2722,17 +2722,6 @@ bool MainFrame::BindControls()
                 continue;
 	    }
 #endif
-#ifndef MMX
-
-	    if (cmdtab[i].cmd_id == XRCID("MMX"))
-	    {
-		if (mi)
-		    mi->GetMenu()->Remove(mi);
-                cmdtab[i].cmd_id = XRCID("NOOP");
-                cmdtab[i].mi = NULL;
-                continue;
-	    }
-#endif
 #if defined(NO_ONLINEUPDATES)
 	    if (cmdtab[i].cmd_id == XRCID("UpdateEmu"))
 	    {
@@ -2908,7 +2897,6 @@ bool MainFrame::BindControls()
         MenuOptionIntMask("JoypadAutoholdR", autohold, KEYM_R);
         MenuOptionIntMask("JoypadAutoholdSelect", autohold, KEYM_SELECT);
         MenuOptionIntMask("JoypadAutoholdStart", autohold, KEYM_START);
-        MenuOptionIntMask("MMX", enableMMX, 1);
         MenuOptionBool("EmulatorSpeedupToggle", turbo);
         MenuOptionIntRadioValue("LinkType0Nothing", gopts.gba_link_type, 0);
         MenuOptionIntRadioValue("LinkType1Cable", gopts.gba_link_type, 1);
@@ -3067,7 +3055,7 @@ bool MainFrame::BindControls()
 #ifndef NO_LINK
         {
             net_link_handler.dlg = d;
-            net_link_handler.n_players = linkNumPlayers;
+            net_link_handler.n_players = gopts.link_num_players;
             getrbbe("Server", net_link_handler.server);
             getrbbd("Client", net_link_handler.server);
             getlab("PlayersLab");
@@ -3656,7 +3644,7 @@ bool MainFrame::BindControls()
         {
             getlab("LinkTimeoutLab");
             addbe(lab);
-            getsc("LinkTimeout", linkTimeout);
+            getsc("LinkTimeout", gopts.link_timeout);
             addbe(sc);
             d->Fit();
         }
@@ -3803,9 +3791,9 @@ bool MainFrame::BindControls()
         mf->SetWindowStyle(mf->GetWindowStyle() & ~wxSTAY_ON_TOP);
 
 #ifndef NO_LINK
-    LinkMode linkMode = GetConfiguredLinkMode();
+    LinkMode link_mode = GetConfiguredLinkMode();
 
-    if (linkMode == LINK_GAMECUBE_DOLPHIN) {
+    if (link_mode == LINK_GAMECUBE_DOLPHIN) {
         bool isv = !gopts.link_host.empty();
 
         if (isv) {
@@ -3815,11 +3803,11 @@ bool MainFrame::BindControls()
         if (!isv) {
             wxLogError(_("JoyBus host invalid; disabling"));
         } else {
-            linkMode = LINK_DISCONNECTED;
+            link_mode = LINK_DISCONNECTED;
         }
     }
 
-    ConnectionState linkState = InitLink(linkMode);
+    ConnectionState linkState = InitLink(link_mode);
 
     if (linkState != LINK_OK) {
         CloseLink();
@@ -3827,8 +3815,8 @@ bool MainFrame::BindControls()
 
     if (GetLinkMode() != LINK_DISCONNECTED) {
         cmd_enable |= CMDEN_LINK_ANY;
-        SetLinkTimeout(linkTimeout);
-        EnableSpeedHacks(linkHacks);
+        SetLinkTimeout(gopts.link_timeout);
+        EnableSpeedHacks(gopts.link_hacks);
     }
 
     EnableNetworkMenu();
diff --git a/src/wx/opts.cpp b/src/wx/opts.cpp
index adcff8bb..f76624a3 100644
--- a/src/wx/opts.cpp
+++ b/src/wx/opts.cpp
@@ -309,44 +309,19 @@ wxAcceleratorEntry_v sys_accels;
 // the default value of every non-object to be 0.
 opts_t::opts_t()
 {
-    frameSkip = -1;
-    audio_api = AUD_SDL;
-
-    retain_aspect = true;
-    max_threads = wxThread::GetCPUCount();
-
     // handle erroneous thread count values appropriately
+    max_threads = wxThread::GetCPUCount();
     if (max_threads > 256)
         max_threads = 256;
 
     if (max_threads < 1)
         max_threads = 1;
 
-    // 10 fixes stuttering on mac with openal, as opposed to 5
-    // also should be better for modern hardware in general
-    audio_buffers = 10;
-
-    sound_en = 0x30f;
-    sound_vol = 100;
-    sound_qual = 1;
-    gb_echo = 20;
-    gb_stereo = 15;
-    gb_declick = true;
-    gba_sound_filter = 50;
-    bilinear = true;
-    default_stick = 1;
-
     recent = new wxFileHistory(10);
-    autofire_rate = 1;
-    print_auto_page = true;
+
+    // These are globals being set here.
+    frameSkip = -1;
     autoPatch = true;
-    // quick fix for issues #48 and #445
-    link_host = "127.0.0.1";
-    server_ip = "*";
-    link_port = 5738;
-
-    hide_menu_bar = true;
-
     skipSaveGameBattery = true;
 }
 
@@ -571,9 +546,10 @@ void load_opts() {
         }
     }
 
-    // Make sure linkTimeout is not set to 1, which was the previous default.
-    if (linkTimeout <= 1)
-        linkTimeout = 500;
+    // 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
diff --git a/src/wx/opts.h b/src/wx/opts.h
index 4beb1511..03962e83 100644
--- a/src/wx/opts.h
+++ b/src/wx/opts.h
@@ -23,73 +23,92 @@ extern struct opts_t {
     // I instead organized this by opts.cpp table order
 
     /// Display
-    bool bilinear;
+    bool bilinear = true;
     wxVideoMode fs_mode;
-    int max_threads;
-    bool retain_aspect;
-    bool keep_on_top;
+    int max_threads = 0;
+    bool retain_aspect = true;
+    bool keep_on_top = false;
 
     /// GB
     wxString gb_bios;
+    bool gb_colorizer_hack = false;
+    bool gb_lcd_filter = false;
     wxString gbc_bios;
-    // uint16_t systemGbPalette[8*3];
-    bool print_auto_page, print_screen_cap;
+    bool print_auto_page = true;
+    bool print_screen_cap = false;
     wxString gb_rom_dir;
     wxString gbc_rom_dir;
 
     /// GBA
     wxString gba_bios;
+    bool gba_lcd_filter = false;
+    bool link_auto = false;
+    bool link_hacks = true;
+    // quick fix for issues #48 and #445
+    wxString link_host = "127.0.0.1";
+    wxString server_ip = "*";
+    uint32_t link_port = 5738;
+    bool link_proto = false;
+    int link_timeout = 500;
     int gba_link_type;
-    wxString link_host;
-    wxString server_ip;
-    uint32_t link_port;
-    int link_proto;
-    bool link_auto;
     wxString gba_rom_dir;
 
     /// General
-    bool autoload_state, autoload_cheats;
+    bool autoload_state = false;
+    bool autoload_cheats = false;
     wxString battery_dir;
     long last_update;
     wxString last_updated_filename;
-    bool recent_freeze;
+    bool recent_freeze = false;
     wxString recording_dir;
-    int rewind_interval;
+    int rewind_interval = 0;
     wxString scrshot_dir;
     wxString state_dir;
-    int statusbar;
+    bool statusbar = false;
 
     /// Joypad
     std::map<config::GameControl, std::set<config::UserInput>>
         game_control_bindings;
-    int autofire_rate;
-    int default_stick;
+    int autofire_rate = 1;
+    int default_stick = 1;
 
     /// Keyboard
     wxAcceleratorEntry_v accels;
 
+    /// Core
+    bool gdb_break_on_load  = false;
+    int gdb_port = 55555;
+    int link_num_players = 2;
+    int max_scale = 0;
+    bool use_bios_file_gb = false;
+    bool use_bios_file_gba = false;
+    bool use_bios_file_gbc = false;
+    bool vsync = false;
+
     /// Sound
-    int audio_api;
-    int audio_buffers;
+    int audio_api = 0;
+    // 10 fixes stuttering on mac with openal, as opposed to 5
+    // also should be better for modern hardware in general
+    int audio_buffers = 10;
     wxString audio_dev;
-    int sound_en; // soundSetEnable()
-    int gba_sound_filter;
+    int sound_en = 0x30f; // soundSetEnable()
+    int gba_sound_filter = 50;
     bool soundInterpolation;
-    bool gb_declick;
-    int gb_echo;
+    bool gb_declick = true;
+    int gb_echo = 20;
     bool gb_effects_config_enabled;
     bool dsound_hw_accel;
-    int gb_stereo;
+    int gb_stereo = 15;
     bool gb_effects_config_surround;
-    int sound_qual; // soundSetSampleRate() / gbSoundSetSampleRate()
-    int sound_vol; // soundSetVolume()
-    bool upmix; // xa2 only
+    int sound_qual = 1; // soundSetSampleRate() / gbSoundSetSampleRate()
+    int sound_vol = 100; // soundSetVolume()
+    bool upmix = false; // xa2 only
 
     /// Recent
-    wxFileHistory* recent;
+    wxFileHistory* recent = nullptr;
 
     /// UI Config
-    bool hide_menu_bar;
+    bool hide_menu_bar = true;
 
     /// wxWindows
     // wxWidgets-generated options (opaque)
diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
index b4540edb..1c568db0 100644
--- a/src/wx/panel.cpp
+++ b/src/wx/panel.cpp
@@ -258,16 +258,17 @@ void GameArea::LoadGame(const wxString& name)
 
 
         // Disable bios loading when using colorizer hack.
-        if (useBiosFileGB && colorizerHack) {
+        if (gopts.use_bios_file_gb && colorizerHack) {
             wxLogError(_("Cannot use GB BIOS file when Colorizer Hack is enabled, disabling GB BIOS file."));
-            useBiosFileGB = 0;
+            gopts.use_bios_file_gb = false;
             update_opts();
         }
 
         // Set up the core for the colorizer hack.
         setColorizerHack(colorizerHack);
 
-        bool use_bios = gbCgbMode ? useBiosFileGBC : useBiosFileGB;
+        bool use_bios =
+            gbCgbMode ? gopts.use_bios_file_gbc : gopts.use_bios_file_gb;
 
         wxCharBuffer fnb(UTF8((gbCgbMode ? gopts.gbc_bios : gopts.gb_bios)));
         const char* fn = fnb.data();
@@ -372,9 +373,9 @@ void GameArea::LoadGame(const wxString& name)
 
         rtcEnableRumble(true);
 
-        CPUInit(UTF8(gopts.gba_bios), useBiosFileGBA);
+        CPUInit(UTF8(gopts.gba_bios), gopts.use_bios_file_gba);
 
-        if (useBiosFileGBA && !useBios) {
+        if (gopts.use_bios_file_gba && !useBios) {
             wxLogError(_("Could not load BIOS %s"), gopts.gba_bios.mb_str());
             // could clear use flag & file name now, but better to force
             // user to do it
@@ -512,8 +513,8 @@ void GameArea::LoadGame(const wxString& name)
 #ifndef NO_LINK
 
     if (gopts.link_auto) {
-        linkMode = mf->GetConfiguredLinkMode();
-        BootLink(linkMode, UTF8(gopts.link_host), linkTimeout, linkHacks, linkNumPlayers);
+        BootLink(mf->GetConfiguredLinkMode(), UTF8(gopts.link_host),
+                 gopts.link_timeout, gopts.link_hacks, gopts.link_num_players);
     }
 
 #endif
@@ -1067,7 +1068,7 @@ void GameArea::OnIdle(wxIdleEvent& event)
         LoadGame(pl);
 
 #ifndef NO_DEBUGGER
-        if (gdbBreakOnLoad)
+        if (gopts.gdb_break_on_load)
             mf->GDBBreak();
 
         if (debugger && loaded != IMAGE_GBA) {
@@ -1148,9 +1149,9 @@ void GameArea::OnIdle(wxIdleEvent& event)
         if (allowKeyboardBackgroundInput)
             enableKeyboardBackgroundInput(w);
 
-        if (maxScale)
-            w->SetMaxSize(wxSize(basic_width * maxScale,
-                basic_height * maxScale));
+        if (gopts.max_scale)
+            w->SetMaxSize(wxSize(basic_width * gopts.max_scale,
+                                 basic_height * gopts.max_scale));
 
         // if user changed Display/Scale config, this needs to run
         AdjustMinSize();
@@ -1190,8 +1191,10 @@ void GameArea::OnIdle(wxIdleEvent& event)
         w->SetFocus();
 
         // generate system color maps (after output module init)
-        if (loaded == IMAGE_GBA) utilUpdateSystemColorMaps(gbaLcdFilter);
-        else if (loaded == IMAGE_GB) utilUpdateSystemColorMaps(gbLcdFilter);
+        if (loaded == IMAGE_GBA)
+            utilUpdateSystemColorMaps(gopts.gba_lcd_filter);
+        else if (loaded == IMAGE_GB)
+            utilUpdateSystemColorMaps(gopts.gb_lcd_filter);
         else utilUpdateSystemColorMaps(false);
     }
 
@@ -2265,16 +2268,16 @@ void GLDrawingPanel::DrawingPanelInit()
 #if defined(__WXGTK__)
     if (IsWayland()) {
 #ifdef HAVE_EGL
-        if (vsync)
+        if (gopts.vsync)
             wxLogDebug(_("Enabling EGL VSync."));
         else
             wxLogDebug(_("Disabling EGL VSync."));
 
-        eglSwapInterval(0, vsync);
+        eglSwapInterval(0, gopts.vsync);
 #endif
     }
     else {
-        if (vsync)
+        if (gopts.vsync)
             wxLogDebug(_("Enabling GLX VSync."));
         else
             wxLogDebug(_("Disabling GLX VSync."));
@@ -2292,7 +2295,8 @@ void GLDrawingPanel::DrawingPanelInit()
         {
             glXSwapIntervalEXT = reinterpret_cast<PFNGLXSWAPINTERVALEXTPROC>(glXGetProcAddress((const GLubyte*)"glXSwapIntervalEXT"));
             if (glXSwapIntervalEXT)
-                glXSwapIntervalEXT(glXGetCurrentDisplay(), glXGetCurrentDrawable(), vsync);
+                glXSwapIntervalEXT(glXGetCurrentDisplay(),
+                                   glXGetCurrentDrawable(), gopts.vsync);
             else
                 systemScreenMessage(_("Failed to set glXSwapIntervalEXT"));
         }
@@ -2301,7 +2305,7 @@ void GLDrawingPanel::DrawingPanelInit()
             glXSwapIntervalSGI = reinterpret_cast<PFNGLXSWAPINTERVALSGIPROC>(glXGetProcAddress((const GLubyte*)("glXSwapIntervalSGI")));
 
             if (glXSwapIntervalSGI)
-                glXSwapIntervalSGI(vsync);
+                glXSwapIntervalSGI(gopts.vsync);
             else
                 systemScreenMessage(_("Failed to set glXSwapIntervalSGI"));
         }
@@ -2310,7 +2314,7 @@ void GLDrawingPanel::DrawingPanelInit()
             glXSwapIntervalMESA = reinterpret_cast<PFNGLXSWAPINTERVALMESAPROC>(glXGetProcAddress((const GLubyte*)("glXSwapIntervalMESA")));
 
             if (glXSwapIntervalMESA)
-                glXSwapIntervalMESA(vsync);
+                glXSwapIntervalMESA(gopts.vsync);
             else
                 systemScreenMessage(_("Failed to set glXSwapIntervalMESA"));
         }
@@ -2329,11 +2333,11 @@ void GLDrawingPanel::DrawingPanelInit()
     static PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = NULL;
     wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)wglGetProcAddress("wglSwapIntervalEXT");
     if (wglSwapIntervalEXT)
-        wglSwapIntervalEXT(vsync);
+        wglSwapIntervalEXT(gopts.vsync);
     else
         systemScreenMessage(_("Failed to set wglSwapIntervalEXT"));
 #elif defined(__WXMAC__)
-    int swap_interval = vsync ? 1 : 0;
+    int swap_interval = gopts.vsync ? 1 : 0;
     CGLContextObj cgl_context = CGLGetCurrentContext();
     CGLSetParameter(cgl_context, kCGLCPSwapInterval, &swap_interval);
 #else
diff --git a/src/wx/sys.cpp b/src/wx/sys.cpp
index d40e4a3f..1f2bd52f 100644
--- a/src/wx/sys.cpp
+++ b/src/wx/sys.cpp
@@ -31,6 +31,7 @@ int RGB_LOW_BITS_MASK;
 // these are local, though.
 int autofire, autohold;
 static int sensorx[4], sensory[4], sensorz[4];
+int sunBars = 1;
 bool pause_next;
 bool turbo;
 
diff --git a/src/wx/wxvbam.cpp b/src/wx/wxvbam.cpp
index 6066e49c..9e506c32 100644
--- a/src/wx/wxvbam.cpp
+++ b/src/wx/wxvbam.cpp
@@ -476,7 +476,7 @@ bool wxvbamApp::OnInit() {
     int width = config::OptGeomWindowWidth()->GetUnsigned();
     int height = config::OptGeomWindowHeight()->GetUnsigned();
     bool isFullscreen = config::OptGeomFullScreen()->GetInt();
-    bool isMaximized = config::OptGeomIsMaximized()->GetInt();
+    bool isMaximized = config::OptGeomIsMaximized()->GetBool();
     frame = wxDynamicCast(xr->LoadFrame(nullptr, "MainFrame"), MainFrame);
 
     if (!frame) {
@@ -865,7 +865,7 @@ void MainFrame::OnSize(wxSizeEvent& event)
         }
     }
 
-    config::OptGeomIsMaximized()->SetInt(IsMaximized());
+    config::OptGeomIsMaximized()->SetBool(IsMaximized());
     config::OptGeomFullScreen()->SetInt(IsFullScreen());
 }
 
diff --git a/src/wx/xrc/MainMenu.xrc b/src/wx/xrc/MainMenu.xrc
index 3393494d..8a76a11b 100644
--- a/src/wx/xrc/MainMenu.xrc
+++ b/src/wx/xrc/MainMenu.xrc
@@ -351,10 +351,6 @@
           <label>_Retain aspect ratio</label>
           <checkable>1</checkable>
         </object>
-        <object class="wxMenuItem" name="MMX">
-          <label>Enable MMX</label>
-          <checkable>1</checkable>
-        </object>
         <object class="separator"/>
         <object class="wxMenuItem" name="Bilinear">
           <label>_Bilinear filter</label>