From bef877365c9aa00a19c1941e5dc1805b4791692d Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Mon, 26 Oct 2015 19:15:21 -0500
Subject: [PATCH] make CDL generic, and prep for GB CDL

---
 BizHawk.Client.EmuHawk/MainForm.Designer.cs   | 6414 +++++++++--------
 BizHawk.Client.EmuHawk/MainForm.cs            |    1 -
 .../tools/PCE/PCECDL.Designer.cs              |    4 +-
 BizHawk.Common/Extensions/IOExtensions.cs     |    1 +
 .../BizHawk.Emulation.Cores.csproj            |    1 +
 BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs   |  162 +-
 .../Nintendo/Gameboy/CodeDataLog_GB.cs        |   23 +
 .../Consoles/PC Engine/PCEngine.CDLMapping.cs |    4 +-
 8 files changed, 3340 insertions(+), 3270 deletions(-)
 create mode 100644 BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/CodeDataLog_GB.cs

diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
index f2bfe11204..f6659d7bdd 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
@@ -17,403 +17,404 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-            this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
-            this.MainformMenu = new MenuStripEx();
-            this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.OpenRomMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.RecentRomSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-            this.CloseRomMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
-            this.SaveStateSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveState1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveState2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveState3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveState4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveState5MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveState6MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveState7MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveState8MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveState9MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveState0MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
-            this.SaveNamedStateMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadStateSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadState1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadState2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadState3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadState4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadState5MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadState6MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadState7MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadState8MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadState9MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadState0MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
-            this.LoadNamedStateMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator();
-            this.AutoloadLastSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveSlotSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.SelectSlot0MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SelectSlot1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SelectSlot2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SelectSlot3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SelectSlot4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SelectSlot5MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SelectSlot6MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SelectSlot7MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SelectSlot8MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SelectSlot9MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PreviousSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.NextSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
-            this.SaveToCurrentSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadCurrentSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveRAMSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.FlushSaveRAMMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
-            this.MovieSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.ReadonlyMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
-            this.RecentMovieSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
-            this.RecordMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PlayMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.StopMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PlayFromBeginningMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ImportMoviesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.StopMovieWithoutSavingMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
-            this.AutomaticallyBackupMoviesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.FullMovieLoadstatesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.MovieEndSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.MovieEndFinishMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.MovieEndRecordMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.MovieEndStopMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.MovieEndPauseMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.AVSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.RecordAVMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.StopAVIMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator();
-            this.CaptureOSDMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SynclessRecordingMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ScreenshotSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.ScreenshotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ScreenshotAsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ScreenshotClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ScreenshotClientClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
-            this.ScreenshotCaptureOSDMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-            this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.EmulationSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.PauseMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.RebootCoreMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.SoftResetMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.HardResetMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ViewSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.WindowSizeSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.x1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.x2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.x3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.x4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.x5MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.mzMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SwitchToFullscreenMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.DisplayFPSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DisplayFrameCounterMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DisplayLagCounterMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DisplayInputMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DisplayRerecordCountMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DisplaySubtitlesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
-            this.DisplayStatusBarMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DisplayMessagesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DisplayLogWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ConfigSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.ControllersMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.HotkeysMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DisplayConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SoundMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PathsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.FirmwaresMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.MessagesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.AutofireMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.RewindOptionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.extensionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ClientOptionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ProfilesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
-            this.SpeedSkipSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.ClockThrottleMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.AudioThrottleMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.VsyncThrottleMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator27 = new System.Windows.Forms.ToolStripSeparator();
-            this.VsyncEnabledMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
-            this.miUnthrottled = new System.Windows.Forms.ToolStripMenuItem();
-            this.MinimizeSkippingMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.NeverSkipMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem17 = new System.Windows.Forms.ToolStripMenuItem();
-            this.Frameskip1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Frameskip2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Frameskip3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Frameskip4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Frameskip5MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Frameskip6MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Frameskip7MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Frameskip8MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Frameskip9MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator();
-            this.Speed50MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Speed75MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Speed100MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Speed150MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Speed200MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.Speed400MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.KeyPrioritySubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.BothHkAndControllerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.InputOverHkMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.HkOverInputMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.CoresSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.GBInSGBMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.NesInQuickNESMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SnesWithSnes9xMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.gBAWithMGBAToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
-            this.N64VideoPluginSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
-            this.SaveConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolBoxMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
-            this.RamWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.RamSearchMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.HexEditorMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.TraceLoggerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DebuggerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.TAStudioMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.MacroToolMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.VirtualPadMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.AutoHawkMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.BasicBotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
-            this.CheatsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LuaConsoleMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator29 = new System.Windows.Forms.ToolStripSeparator();
-            this.MultiDiskBundlerFileMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.batchRunnerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.NESSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.coreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.quickNESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.nesHawkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator34 = new System.Windows.Forms.ToolStripSeparator();
-            this.NESPPUViewerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.NESNametableViewerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.NESGameGenieCodesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.musicRipperToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
-            this.NesControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.NESGraphicSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.NESSoundChannelsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.MovieSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
-            this.FDSControlsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.FdsEjectDiskMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.barcodeReaderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PCESubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.PceControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PCEGraphicsSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator32 = new System.Windows.Forms.ToolStripSeparator();
-            this.PCEBGViewerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PCEtileViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PceSoundDebuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.codeDataLoggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator();
-            this.PCEAlwaysPerformSpriteLimitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PCEAlwaysEqualizeVolumesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PCEArcadeCardRewindEnableMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSregionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSregionExportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSregionJapanToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSregionAutoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSdisplayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSdisplayNtscToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSdisplayPalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSdisplayAutoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMStoolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
-            this.SMSenableBIOSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSEnableFMChipMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSOverclockMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSForceStereoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSSpriteLimitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSFix3DGameDisplayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ShowClippedRegionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.HighlightActiveDisplayRegionMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SMSGraphicsSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator24 = new System.Windows.Forms.ToolStripSeparator();
-            this.SMSVDPViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.GGGameGenieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.TI83SubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.KeypadMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadTIFileMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
-            this.AutoloadKeypadMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.paletteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.AtariSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.AtariSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.GBSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.GBcoreSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadGBInSGBMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator28 = new System.Windows.Forms.ToolStripSeparator();
-            this.GBGPUViewerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.GBGameGenieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.GBASubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.GBACoreSelectionSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.GBAmGBAMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.GBAVBANextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.GBAcoresettingsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator33 = new System.Windows.Forms.ToolStripSeparator();
-            this.GbaGpuViewerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PSXSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.PSXControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PSXOptionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PSXDiscControlsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PSXHashDiscsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SNESSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.SNESDisplayMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SnesBg1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SnesBg2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SnesBg3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SnesBg4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SnesObj1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SnesObj2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SnesObj3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SnesObj4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator();
-            this.SnesGfxDebuggerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SnesGBInSGBMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SnesGameGenieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SnesOptionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ColecoSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.ColecoSkipBiosMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.N64SubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.N64PluginSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.N64ControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator();
-            this.N64CircularAnalogRangeMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.MupenStyleLagMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.N64ExpansionSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaturnSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaturnPreferencesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DGBSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.DGBsettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.GenesisSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.vDPViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.GenesisGameGenieECDC = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator26 = new System.Windows.Forms.ToolStripSeparator();
-            this.GenesisSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.wonderSwanToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.AppleSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.AppleDisksSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator31 = new System.Windows.Forms.ToolStripSeparator();
-            this.settingsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.C64SubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.C64SettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.OnlineHelpMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ForumsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.FeaturesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.AboutMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.MainStatusBar = new StatusStripEx();
-            this.DumpStatusButton = new System.Windows.Forms.ToolStripDropDownButton();
-            this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel();
-            this.PlayRecordStatusButton = new System.Windows.Forms.ToolStripDropDownButton();
-            this.PauseStatusButton = new System.Windows.Forms.ToolStripDropDownButton();
-            this.RebootStatusBarIcon = new System.Windows.Forms.ToolStripStatusLabel();
-            this.AVIStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
-            this.LedLightStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
-            this.SaveSlotsStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
-            this.Slot1StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
-            this.Slot2StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
-            this.Slot3StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
-            this.Slot4StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
-            this.Slot5StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
-            this.Slot6StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
-            this.Slot7StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
-            this.Slot8StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
-            this.Slot9StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
-            this.Slot0StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
-            this.CheatStatusButton = new System.Windows.Forms.ToolStripStatusLabel();
-            this.KeyPriorityStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
-            this.CoreNameStatusBarButton = new System.Windows.Forms.ToolStripStatusLabel();
-            this.ProfileFirstBootLabel = new System.Windows.Forms.ToolStripStatusLabel();
-            this.LinkConnectStatusBarButton = new System.Windows.Forms.ToolStripStatusLabel();
-            this.UpdateNotification = new System.Windows.Forms.ToolStripStatusLabel();
-            this.MainFormContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.OpenRomContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadLastRomContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.StopAVContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ContextSeparator_AfterROM = new System.Windows.Forms.ToolStripSeparator();
-            this.RecordMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PlayMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.RestartMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.StopMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadLastMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.BackupMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.StopNoSaveContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ViewSubtitlesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.AddSubtitleContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ViewCommentsContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ContextSeparator_AfterMovie = new System.Windows.Forms.ToolStripSeparator();
-            this.UndoSavestateContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ContextSeparator_AfterUndo = new System.Windows.Forms.ToolStripSeparator();
-            this.ConfigContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem11 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem12 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem13 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem14 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem15 = new System.Windows.Forms.ToolStripMenuItem();
-            this.customizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator30 = new System.Windows.Forms.ToolStripSeparator();
-            this.SavestateTypeContextSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.SavestateTypeDefaultContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SavestateBinaryContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SavestateTextContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.CoreSelectionContextSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.GBInSGBContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.NesInQuickNESContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator37 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripMenuItem66 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem67 = new System.Windows.Forms.ToolStripMenuItem();
-            this.ScreenshotContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.CloseRomContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ClearSRAMContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator();
-            this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.timerMouseIdle = new System.Windows.Forms.Timer(this.components);
-            this.MainformMenu.SuspendLayout();
-            this.MainStatusBar.SuspendLayout();
-            this.MainFormContextMenu.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // MainformMenu
-            // 
-            this.MainformMenu.ClickThrough = true;
-            this.MainformMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
+			this.MainformMenu = new MenuStripEx();
+			this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.OpenRomMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.RecentRomSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+			this.CloseRomMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
+			this.SaveStateSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveState1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveState2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveState3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveState4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveState5MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveState6MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveState7MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveState8MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveState9MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveState0MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+			this.SaveNamedStateMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadStateSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadState1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadState2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadState3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadState4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadState5MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadState6MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadState7MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadState8MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadState9MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadState0MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+			this.LoadNamedStateMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator();
+			this.AutoloadLastSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveSlotSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.SelectSlot0MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SelectSlot1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SelectSlot2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SelectSlot3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SelectSlot4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SelectSlot5MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SelectSlot6MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SelectSlot7MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SelectSlot8MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SelectSlot9MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PreviousSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.NextSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+			this.SaveToCurrentSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadCurrentSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveRAMSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.FlushSaveRAMMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
+			this.MovieSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.ReadonlyMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
+			this.RecentMovieSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
+			this.RecordMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PlayMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.StopMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PlayFromBeginningMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ImportMoviesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.StopMovieWithoutSavingMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
+			this.AutomaticallyBackupMoviesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.FullMovieLoadstatesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.MovieEndSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.MovieEndFinishMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.MovieEndRecordMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.MovieEndStopMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.MovieEndPauseMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.AVSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.RecordAVMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.StopAVIMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator();
+			this.CaptureOSDMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SynclessRecordingMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ScreenshotSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.ScreenshotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ScreenshotAsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ScreenshotClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ScreenshotClientClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
+			this.ScreenshotCaptureOSDMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+			this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.EmulationSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.PauseMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.RebootCoreMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.SoftResetMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.HardResetMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ViewSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.WindowSizeSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.x1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.x2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.x3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.x4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.x5MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.mzMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SwitchToFullscreenMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+			this.DisplayFPSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.DisplayFrameCounterMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.DisplayLagCounterMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.DisplayInputMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.DisplayRerecordCountMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.DisplaySubtitlesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
+			this.DisplayStatusBarMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.DisplayMessagesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.DisplayLogWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ConfigSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.ControllersMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.HotkeysMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.DisplayConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SoundMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PathsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.FirmwaresMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.MessagesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.AutofireMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.RewindOptionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.extensionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ClientOptionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ProfilesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+			this.SpeedSkipSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.ClockThrottleMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.AudioThrottleMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.VsyncThrottleMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator27 = new System.Windows.Forms.ToolStripSeparator();
+			this.VsyncEnabledMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
+			this.miUnthrottled = new System.Windows.Forms.ToolStripMenuItem();
+			this.MinimizeSkippingMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.NeverSkipMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem17 = new System.Windows.Forms.ToolStripMenuItem();
+			this.Frameskip1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.Frameskip2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.Frameskip3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.Frameskip4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.Frameskip5MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.Frameskip6MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.Frameskip7MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.Frameskip8MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.Frameskip9MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator();
+			this.Speed50MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.Speed75MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.Speed100MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.Speed150MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.Speed200MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.Speed400MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.KeyPrioritySubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.BothHkAndControllerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.InputOverHkMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.HkOverInputMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.CoresSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.GBInSGBMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.NesInQuickNESMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SnesWithSnes9xMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.gBAWithMGBAToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+			this.N64VideoPluginSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
+			this.SaveConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ToolsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.ToolBoxMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
+			this.RamWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.RamSearchMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.HexEditorMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.TraceLoggerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.DebuggerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.TAStudioMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.MacroToolMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.VirtualPadMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.AutoHawkMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.BasicBotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
+			this.CheatsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LuaConsoleMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator29 = new System.Windows.Forms.ToolStripSeparator();
+			this.MultiDiskBundlerFileMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.batchRunnerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.NESSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.coreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.quickNESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.nesHawkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator34 = new System.Windows.Forms.ToolStripSeparator();
+			this.NESPPUViewerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.NESNametableViewerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.NESGameGenieCodesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.musicRipperToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
+			this.NesControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.NESGraphicSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.NESSoundChannelsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.MovieSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
+			this.FDSControlsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.FdsEjectDiskMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.barcodeReaderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PCESubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.PceControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PCEGraphicsSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator32 = new System.Windows.Forms.ToolStripSeparator();
+			this.PCEBGViewerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PCEtileViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PceSoundDebuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.codeDataLoggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator();
+			this.PCEAlwaysPerformSpriteLimitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PCEAlwaysEqualizeVolumesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PCEArcadeCardRewindEnableMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSregionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSregionExportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSregionJapanToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSregionAutoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSdisplayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSdisplayNtscToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSdisplayPalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSdisplayAutoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMStoolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
+			this.SMSenableBIOSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSEnableFMChipMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSOverclockMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSForceStereoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSSpriteLimitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSFix3DGameDisplayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ShowClippedRegionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.HighlightActiveDisplayRegionMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SMSGraphicsSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator24 = new System.Windows.Forms.ToolStripSeparator();
+			this.SMSVDPViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.GGGameGenieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.TI83SubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.KeypadMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadTIFileMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
+			this.AutoloadKeypadMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.paletteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.AtariSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.AtariSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.GBSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.GBcoreSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadGBInSGBMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator28 = new System.Windows.Forms.ToolStripSeparator();
+			this.GBGPUViewerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem16 = new System.Windows.Forms.ToolStripMenuItem();
+			this.GBGameGenieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.GBASubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.GBACoreSelectionSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.GBAmGBAMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.GBAVBANextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.GBAcoresettingsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator33 = new System.Windows.Forms.ToolStripSeparator();
+			this.GbaGpuViewerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PSXSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.PSXControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PSXOptionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PSXDiscControlsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PSXHashDiscsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SNESSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.SNESDisplayMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SnesBg1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SnesBg2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SnesBg3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SnesBg4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SnesObj1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SnesObj2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SnesObj3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SnesObj4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator();
+			this.SnesGfxDebuggerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SnesGBInSGBMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SnesGameGenieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SnesOptionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ColecoSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.ColecoSkipBiosMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.N64SubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.N64PluginSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.N64ControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator();
+			this.N64CircularAnalogRangeMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.MupenStyleLagMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.N64ExpansionSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaturnSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaturnPreferencesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.DGBSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.DGBsettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.GenesisSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.vDPViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.GenesisGameGenieECDC = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator26 = new System.Windows.Forms.ToolStripSeparator();
+			this.GenesisSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.wonderSwanToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.AppleSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.AppleDisksSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator31 = new System.Windows.Forms.ToolStripSeparator();
+			this.settingsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+			this.C64SubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.C64SettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.OnlineHelpMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ForumsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.FeaturesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.AboutMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.MainStatusBar = new StatusStripEx();
+			this.DumpStatusButton = new System.Windows.Forms.ToolStripDropDownButton();
+			this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel();
+			this.PlayRecordStatusButton = new System.Windows.Forms.ToolStripDropDownButton();
+			this.PauseStatusButton = new System.Windows.Forms.ToolStripDropDownButton();
+			this.RebootStatusBarIcon = new System.Windows.Forms.ToolStripStatusLabel();
+			this.AVIStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.LedLightStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.SaveSlotsStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.Slot1StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
+			this.Slot2StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
+			this.Slot3StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
+			this.Slot4StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
+			this.Slot5StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
+			this.Slot6StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
+			this.Slot7StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
+			this.Slot8StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
+			this.Slot9StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
+			this.Slot0StatusButton = new System.Windows.Forms.ToolStripStatusLabel();
+			this.CheatStatusButton = new System.Windows.Forms.ToolStripStatusLabel();
+			this.KeyPriorityStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.CoreNameStatusBarButton = new System.Windows.Forms.ToolStripStatusLabel();
+			this.ProfileFirstBootLabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.LinkConnectStatusBarButton = new System.Windows.Forms.ToolStripStatusLabel();
+			this.UpdateNotification = new System.Windows.Forms.ToolStripStatusLabel();
+			this.MainFormContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.OpenRomContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadLastRomContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.StopAVContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ContextSeparator_AfterROM = new System.Windows.Forms.ToolStripSeparator();
+			this.RecordMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.PlayMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.RestartMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.StopMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadLastMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.BackupMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.StopNoSaveContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ViewSubtitlesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.AddSubtitleContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ViewCommentsContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ContextSeparator_AfterMovie = new System.Windows.Forms.ToolStripSeparator();
+			this.UndoSavestateContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ContextSeparator_AfterUndo = new System.Windows.Forms.ToolStripSeparator();
+			this.ConfigContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem11 = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem12 = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem13 = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem14 = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem15 = new System.Windows.Forms.ToolStripMenuItem();
+			this.customizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator30 = new System.Windows.Forms.ToolStripSeparator();
+			this.SavestateTypeContextSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.SavestateTypeDefaultContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SavestateBinaryContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SavestateTextContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.CoreSelectionContextSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.GBInSGBContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.NesInQuickNESContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator37 = new System.Windows.Forms.ToolStripSeparator();
+			this.toolStripMenuItem66 = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem67 = new System.Windows.Forms.ToolStripMenuItem();
+			this.ScreenshotContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.CloseRomContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ClearSRAMContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator();
+			this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.timerMouseIdle = new System.Windows.Forms.Timer(this.components);
+			this.MainformMenu.SuspendLayout();
+			this.MainStatusBar.SuspendLayout();
+			this.MainFormContextMenu.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// MainformMenu
+			// 
+			this.MainformMenu.ClickThrough = true;
+			this.MainformMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.FileSubMenu,
             this.EmulationSubMenu,
             this.ViewSubMenu,
@@ -437,19 +438,19 @@
             this.AppleSubMenu,
             this.C64SubMenu,
             this.HelpSubMenu});
-            this.MainformMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
-            this.MainformMenu.Location = new System.Drawing.Point(0, 0);
-            this.MainformMenu.Name = "MainformMenu";
-            this.MainformMenu.Size = new System.Drawing.Size(470, 61);
-            this.MainformMenu.TabIndex = 0;
-            this.MainformMenu.Text = "menuStrip1";
-            this.MainformMenu.MenuActivate += new System.EventHandler(this.MainformMenu_MenuActivate);
-            this.MainformMenu.MenuDeactivate += new System.EventHandler(this.MainformMenu_MenuDeactivate);
-            this.MainformMenu.Leave += new System.EventHandler(this.MainformMenu_Leave);
-            // 
-            // FileSubMenu
-            // 
-            this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.MainformMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
+			this.MainformMenu.Location = new System.Drawing.Point(0, 0);
+			this.MainformMenu.Name = "MainformMenu";
+			this.MainformMenu.Size = new System.Drawing.Size(470, 57);
+			this.MainformMenu.TabIndex = 0;
+			this.MainformMenu.Text = "menuStrip1";
+			this.MainformMenu.MenuActivate += new System.EventHandler(this.MainformMenu_MenuActivate);
+			this.MainformMenu.MenuDeactivate += new System.EventHandler(this.MainformMenu_MenuDeactivate);
+			this.MainformMenu.Leave += new System.EventHandler(this.MainformMenu_Leave);
+			// 
+			// FileSubMenu
+			// 
+			this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.OpenRomMenuItem,
             this.RecentRomSubMenu,
             this.CloseRomMenuItem,
@@ -464,50 +465,50 @@
             this.ScreenshotSubMenu,
             this.toolStripSeparator4,
             this.ExitMenuItem});
-            this.FileSubMenu.Name = "FileSubMenu";
-            this.FileSubMenu.Size = new System.Drawing.Size(37, 19);
-            this.FileSubMenu.Text = "&File";
-            this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened);
-            // 
-            // OpenRomMenuItem
-            // 
-            this.OpenRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
-            this.OpenRomMenuItem.Name = "OpenRomMenuItem";
-            this.OpenRomMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.OpenRomMenuItem.Text = "Open ROM";
-            this.OpenRomMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click);
-            // 
-            // RecentRomSubMenu
-            // 
-            this.RecentRomSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.FileSubMenu.Name = "FileSubMenu";
+			this.FileSubMenu.Size = new System.Drawing.Size(35, 17);
+			this.FileSubMenu.Text = "&File";
+			this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened);
+			// 
+			// OpenRomMenuItem
+			// 
+			this.OpenRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
+			this.OpenRomMenuItem.Name = "OpenRomMenuItem";
+			this.OpenRomMenuItem.Size = new System.Drawing.Size(134, 22);
+			this.OpenRomMenuItem.Text = "Open ROM";
+			this.OpenRomMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click);
+			// 
+			// RecentRomSubMenu
+			// 
+			this.RecentRomSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripSeparator3});
-            this.RecentRomSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
-            this.RecentRomSubMenu.Name = "RecentRomSubMenu";
-            this.RecentRomSubMenu.Size = new System.Drawing.Size(152, 22);
-            this.RecentRomSubMenu.Text = "Recent ROM";
-            this.RecentRomSubMenu.DropDownOpened += new System.EventHandler(this.RecentRomMenuItem_DropDownOpened);
-            // 
-            // toolStripSeparator3
-            // 
-            this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
-            // 
-            // CloseRomMenuItem
-            // 
-            this.CloseRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close;
-            this.CloseRomMenuItem.Name = "CloseRomMenuItem";
-            this.CloseRomMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.CloseRomMenuItem.Text = "&Close ROM";
-            this.CloseRomMenuItem.Click += new System.EventHandler(this.CloseRomMenuItem_Click);
-            // 
-            // toolStripMenuItem1
-            // 
-            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
-            // 
-            // SaveStateSubMenu
-            // 
-            this.SaveStateSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.RecentRomSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
+			this.RecentRomSubMenu.Name = "RecentRomSubMenu";
+			this.RecentRomSubMenu.Size = new System.Drawing.Size(134, 22);
+			this.RecentRomSubMenu.Text = "Recent ROM";
+			this.RecentRomSubMenu.DropDownOpened += new System.EventHandler(this.RecentRomMenuItem_DropDownOpened);
+			// 
+			// toolStripSeparator3
+			// 
+			this.toolStripSeparator3.Name = "toolStripSeparator3";
+			this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6);
+			// 
+			// CloseRomMenuItem
+			// 
+			this.CloseRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close;
+			this.CloseRomMenuItem.Name = "CloseRomMenuItem";
+			this.CloseRomMenuItem.Size = new System.Drawing.Size(134, 22);
+			this.CloseRomMenuItem.Text = "&Close ROM";
+			this.CloseRomMenuItem.Click += new System.EventHandler(this.CloseRomMenuItem_Click);
+			// 
+			// toolStripMenuItem1
+			// 
+			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+			this.toolStripMenuItem1.Size = new System.Drawing.Size(131, 6);
+			// 
+			// SaveStateSubMenu
+			// 
+			this.SaveStateSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.SaveState1MenuItem,
             this.SaveState2MenuItem,
             this.SaveState3MenuItem,
@@ -520,96 +521,96 @@
             this.SaveState0MenuItem,
             this.toolStripSeparator6,
             this.SaveNamedStateMenuItem});
-            this.SaveStateSubMenu.Name = "SaveStateSubMenu";
-            this.SaveStateSubMenu.Size = new System.Drawing.Size(152, 22);
-            this.SaveStateSubMenu.Text = "Save State";
-            this.SaveStateSubMenu.DropDownOpened += new System.EventHandler(this.SaveStateSubMenu_DropDownOpened);
-            // 
-            // SaveState1MenuItem
-            // 
-            this.SaveState1MenuItem.Name = "SaveState1MenuItem";
-            this.SaveState1MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SaveState1MenuItem.Text = "1";
-            this.SaveState1MenuItem.Click += new System.EventHandler(this.Savestate1MenuItem_Click);
-            // 
-            // SaveState2MenuItem
-            // 
-            this.SaveState2MenuItem.Name = "SaveState2MenuItem";
-            this.SaveState2MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SaveState2MenuItem.Text = "2";
-            this.SaveState2MenuItem.Click += new System.EventHandler(this.Savestate2MenuItem_Click);
-            // 
-            // SaveState3MenuItem
-            // 
-            this.SaveState3MenuItem.Name = "SaveState3MenuItem";
-            this.SaveState3MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SaveState3MenuItem.Text = "3";
-            this.SaveState3MenuItem.Click += new System.EventHandler(this.Savestate3MenuItem_Click);
-            // 
-            // SaveState4MenuItem
-            // 
-            this.SaveState4MenuItem.Name = "SaveState4MenuItem";
-            this.SaveState4MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SaveState4MenuItem.Text = "4";
-            this.SaveState4MenuItem.Click += new System.EventHandler(this.Savestate4MenuItem_Click);
-            // 
-            // SaveState5MenuItem
-            // 
-            this.SaveState5MenuItem.Name = "SaveState5MenuItem";
-            this.SaveState5MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SaveState5MenuItem.Text = "5";
-            this.SaveState5MenuItem.Click += new System.EventHandler(this.Savestate5MenuItem_Click);
-            // 
-            // SaveState6MenuItem
-            // 
-            this.SaveState6MenuItem.Name = "SaveState6MenuItem";
-            this.SaveState6MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SaveState6MenuItem.Text = "6";
-            this.SaveState6MenuItem.Click += new System.EventHandler(this.Savestate6MenuItem_Click);
-            // 
-            // SaveState7MenuItem
-            // 
-            this.SaveState7MenuItem.Name = "SaveState7MenuItem";
-            this.SaveState7MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SaveState7MenuItem.Text = "7";
-            this.SaveState7MenuItem.Click += new System.EventHandler(this.Savestate7MenuItem_Click);
-            // 
-            // SaveState8MenuItem
-            // 
-            this.SaveState8MenuItem.Name = "SaveState8MenuItem";
-            this.SaveState8MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SaveState8MenuItem.Text = "8";
-            this.SaveState8MenuItem.Click += new System.EventHandler(this.Savestate8MenuItem_Click);
-            // 
-            // SaveState9MenuItem
-            // 
-            this.SaveState9MenuItem.Name = "SaveState9MenuItem";
-            this.SaveState9MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SaveState9MenuItem.Text = "9";
-            this.SaveState9MenuItem.Click += new System.EventHandler(this.Savestate9MenuItem_Click);
-            // 
-            // SaveState0MenuItem
-            // 
-            this.SaveState0MenuItem.Name = "SaveState0MenuItem";
-            this.SaveState0MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SaveState0MenuItem.Text = "0";
-            this.SaveState0MenuItem.Click += new System.EventHandler(this.Savestate0MenuItem_Click);
-            // 
-            // toolStripSeparator6
-            // 
-            this.toolStripSeparator6.Name = "toolStripSeparator6";
-            this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6);
-            // 
-            // SaveNamedStateMenuItem
-            // 
-            this.SaveNamedStateMenuItem.Name = "SaveNamedStateMenuItem";
-            this.SaveNamedStateMenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SaveNamedStateMenuItem.Text = "Save Named State...";
-            this.SaveNamedStateMenuItem.Click += new System.EventHandler(this.SaveNamedStateMenuItem_Click);
-            // 
-            // LoadStateSubMenu
-            // 
-            this.LoadStateSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.SaveStateSubMenu.Name = "SaveStateSubMenu";
+			this.SaveStateSubMenu.Size = new System.Drawing.Size(134, 22);
+			this.SaveStateSubMenu.Text = "Save State";
+			this.SaveStateSubMenu.DropDownOpened += new System.EventHandler(this.SaveStateSubMenu_DropDownOpened);
+			// 
+			// SaveState1MenuItem
+			// 
+			this.SaveState1MenuItem.Name = "SaveState1MenuItem";
+			this.SaveState1MenuItem.Size = new System.Drawing.Size(175, 22);
+			this.SaveState1MenuItem.Text = "1";
+			this.SaveState1MenuItem.Click += new System.EventHandler(this.Savestate1MenuItem_Click);
+			// 
+			// SaveState2MenuItem
+			// 
+			this.SaveState2MenuItem.Name = "SaveState2MenuItem";
+			this.SaveState2MenuItem.Size = new System.Drawing.Size(175, 22);
+			this.SaveState2MenuItem.Text = "2";
+			this.SaveState2MenuItem.Click += new System.EventHandler(this.Savestate2MenuItem_Click);
+			// 
+			// SaveState3MenuItem
+			// 
+			this.SaveState3MenuItem.Name = "SaveState3MenuItem";
+			this.SaveState3MenuItem.Size = new System.Drawing.Size(175, 22);
+			this.SaveState3MenuItem.Text = "3";
+			this.SaveState3MenuItem.Click += new System.EventHandler(this.Savestate3MenuItem_Click);
+			// 
+			// SaveState4MenuItem
+			// 
+			this.SaveState4MenuItem.Name = "SaveState4MenuItem";
+			this.SaveState4MenuItem.Size = new System.Drawing.Size(175, 22);
+			this.SaveState4MenuItem.Text = "4";
+			this.SaveState4MenuItem.Click += new System.EventHandler(this.Savestate4MenuItem_Click);
+			// 
+			// SaveState5MenuItem
+			// 
+			this.SaveState5MenuItem.Name = "SaveState5MenuItem";
+			this.SaveState5MenuItem.Size = new System.Drawing.Size(175, 22);
+			this.SaveState5MenuItem.Text = "5";
+			this.SaveState5MenuItem.Click += new System.EventHandler(this.Savestate5MenuItem_Click);
+			// 
+			// SaveState6MenuItem
+			// 
+			this.SaveState6MenuItem.Name = "SaveState6MenuItem";
+			this.SaveState6MenuItem.Size = new System.Drawing.Size(175, 22);
+			this.SaveState6MenuItem.Text = "6";
+			this.SaveState6MenuItem.Click += new System.EventHandler(this.Savestate6MenuItem_Click);
+			// 
+			// SaveState7MenuItem
+			// 
+			this.SaveState7MenuItem.Name = "SaveState7MenuItem";
+			this.SaveState7MenuItem.Size = new System.Drawing.Size(175, 22);
+			this.SaveState7MenuItem.Text = "7";
+			this.SaveState7MenuItem.Click += new System.EventHandler(this.Savestate7MenuItem_Click);
+			// 
+			// SaveState8MenuItem
+			// 
+			this.SaveState8MenuItem.Name = "SaveState8MenuItem";
+			this.SaveState8MenuItem.Size = new System.Drawing.Size(175, 22);
+			this.SaveState8MenuItem.Text = "8";
+			this.SaveState8MenuItem.Click += new System.EventHandler(this.Savestate8MenuItem_Click);
+			// 
+			// SaveState9MenuItem
+			// 
+			this.SaveState9MenuItem.Name = "SaveState9MenuItem";
+			this.SaveState9MenuItem.Size = new System.Drawing.Size(175, 22);
+			this.SaveState9MenuItem.Text = "9";
+			this.SaveState9MenuItem.Click += new System.EventHandler(this.Savestate9MenuItem_Click);
+			// 
+			// SaveState0MenuItem
+			// 
+			this.SaveState0MenuItem.Name = "SaveState0MenuItem";
+			this.SaveState0MenuItem.Size = new System.Drawing.Size(175, 22);
+			this.SaveState0MenuItem.Text = "0";
+			this.SaveState0MenuItem.Click += new System.EventHandler(this.Savestate0MenuItem_Click);
+			// 
+			// toolStripSeparator6
+			// 
+			this.toolStripSeparator6.Name = "toolStripSeparator6";
+			this.toolStripSeparator6.Size = new System.Drawing.Size(172, 6);
+			// 
+			// SaveNamedStateMenuItem
+			// 
+			this.SaveNamedStateMenuItem.Name = "SaveNamedStateMenuItem";
+			this.SaveNamedStateMenuItem.Size = new System.Drawing.Size(175, 22);
+			this.SaveNamedStateMenuItem.Text = "Save Named State...";
+			this.SaveNamedStateMenuItem.Click += new System.EventHandler(this.SaveNamedStateMenuItem_Click);
+			// 
+			// LoadStateSubMenu
+			// 
+			this.LoadStateSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.LoadState1MenuItem,
             this.LoadState2MenuItem,
             this.LoadState3MenuItem,
@@ -624,108 +625,108 @@
             this.LoadNamedStateMenuItem,
             this.toolStripSeparator21,
             this.AutoloadLastSlotMenuItem});
-            this.LoadStateSubMenu.Name = "LoadStateSubMenu";
-            this.LoadStateSubMenu.Size = new System.Drawing.Size(152, 22);
-            this.LoadStateSubMenu.Text = "Load State";
-            this.LoadStateSubMenu.DropDownOpened += new System.EventHandler(this.LoadStateSubMenu_DropDownOpened);
-            // 
-            // LoadState1MenuItem
-            // 
-            this.LoadState1MenuItem.Name = "LoadState1MenuItem";
-            this.LoadState1MenuItem.Size = new System.Drawing.Size(180, 22);
-            this.LoadState1MenuItem.Text = "1";
-            this.LoadState1MenuItem.Click += new System.EventHandler(this.Loadstate1MenuItem_Click);
-            // 
-            // LoadState2MenuItem
-            // 
-            this.LoadState2MenuItem.Name = "LoadState2MenuItem";
-            this.LoadState2MenuItem.Size = new System.Drawing.Size(180, 22);
-            this.LoadState2MenuItem.Text = "2";
-            this.LoadState2MenuItem.Click += new System.EventHandler(this.Loadstate2MenuItem_Click);
-            // 
-            // LoadState3MenuItem
-            // 
-            this.LoadState3MenuItem.Name = "LoadState3MenuItem";
-            this.LoadState3MenuItem.Size = new System.Drawing.Size(180, 22);
-            this.LoadState3MenuItem.Text = "3";
-            this.LoadState3MenuItem.Click += new System.EventHandler(this.Loadstate3MenuItem_Click);
-            // 
-            // LoadState4MenuItem
-            // 
-            this.LoadState4MenuItem.Name = "LoadState4MenuItem";
-            this.LoadState4MenuItem.Size = new System.Drawing.Size(180, 22);
-            this.LoadState4MenuItem.Text = "4";
-            this.LoadState4MenuItem.Click += new System.EventHandler(this.Loadstate4MenuItem_Click);
-            // 
-            // LoadState5MenuItem
-            // 
-            this.LoadState5MenuItem.Name = "LoadState5MenuItem";
-            this.LoadState5MenuItem.Size = new System.Drawing.Size(180, 22);
-            this.LoadState5MenuItem.Text = "5";
-            this.LoadState5MenuItem.Click += new System.EventHandler(this.Loadstate5MenuItem_Click);
-            // 
-            // LoadState6MenuItem
-            // 
-            this.LoadState6MenuItem.Name = "LoadState6MenuItem";
-            this.LoadState6MenuItem.Size = new System.Drawing.Size(180, 22);
-            this.LoadState6MenuItem.Text = "6";
-            this.LoadState6MenuItem.Click += new System.EventHandler(this.Loadstate6MenuItem_Click);
-            // 
-            // LoadState7MenuItem
-            // 
-            this.LoadState7MenuItem.Name = "LoadState7MenuItem";
-            this.LoadState7MenuItem.Size = new System.Drawing.Size(180, 22);
-            this.LoadState7MenuItem.Text = "7";
-            this.LoadState7MenuItem.Click += new System.EventHandler(this.Loadstate7MenuItem_Click);
-            // 
-            // LoadState8MenuItem
-            // 
-            this.LoadState8MenuItem.Name = "LoadState8MenuItem";
-            this.LoadState8MenuItem.Size = new System.Drawing.Size(180, 22);
-            this.LoadState8MenuItem.Text = "8";
-            this.LoadState8MenuItem.Click += new System.EventHandler(this.Loadstate8MenuItem_Click);
-            // 
-            // LoadState9MenuItem
-            // 
-            this.LoadState9MenuItem.Name = "LoadState9MenuItem";
-            this.LoadState9MenuItem.Size = new System.Drawing.Size(180, 22);
-            this.LoadState9MenuItem.Text = "9";
-            this.LoadState9MenuItem.Click += new System.EventHandler(this.Loadstate9MenuItem_Click);
-            // 
-            // LoadState0MenuItem
-            // 
-            this.LoadState0MenuItem.Name = "LoadState0MenuItem";
-            this.LoadState0MenuItem.Size = new System.Drawing.Size(180, 22);
-            this.LoadState0MenuItem.Text = "0";
-            this.LoadState0MenuItem.Click += new System.EventHandler(this.Loadstate0MenuItem_Click);
-            // 
-            // toolStripSeparator7
-            // 
-            this.toolStripSeparator7.Name = "toolStripSeparator7";
-            this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
-            // 
-            // LoadNamedStateMenuItem
-            // 
-            this.LoadNamedStateMenuItem.Name = "LoadNamedStateMenuItem";
-            this.LoadNamedStateMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.LoadNamedStateMenuItem.Text = "Load Named State...";
-            this.LoadNamedStateMenuItem.Click += new System.EventHandler(this.LoadNamedStateMenuItem_Click);
-            // 
-            // toolStripSeparator21
-            // 
-            this.toolStripSeparator21.Name = "toolStripSeparator21";
-            this.toolStripSeparator21.Size = new System.Drawing.Size(177, 6);
-            // 
-            // AutoloadLastSlotMenuItem
-            // 
-            this.AutoloadLastSlotMenuItem.Name = "AutoloadLastSlotMenuItem";
-            this.AutoloadLastSlotMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.AutoloadLastSlotMenuItem.Text = "Autoload last Slot";
-            this.AutoloadLastSlotMenuItem.Click += new System.EventHandler(this.AutoloadLastSlotMenuItem_Click);
-            // 
-            // SaveSlotSubMenu
-            // 
-            this.SaveSlotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.LoadStateSubMenu.Name = "LoadStateSubMenu";
+			this.LoadStateSubMenu.Size = new System.Drawing.Size(134, 22);
+			this.LoadStateSubMenu.Text = "Load State";
+			this.LoadStateSubMenu.DropDownOpened += new System.EventHandler(this.LoadStateSubMenu_DropDownOpened);
+			// 
+			// LoadState1MenuItem
+			// 
+			this.LoadState1MenuItem.Name = "LoadState1MenuItem";
+			this.LoadState1MenuItem.Size = new System.Drawing.Size(174, 22);
+			this.LoadState1MenuItem.Text = "1";
+			this.LoadState1MenuItem.Click += new System.EventHandler(this.Loadstate1MenuItem_Click);
+			// 
+			// LoadState2MenuItem
+			// 
+			this.LoadState2MenuItem.Name = "LoadState2MenuItem";
+			this.LoadState2MenuItem.Size = new System.Drawing.Size(174, 22);
+			this.LoadState2MenuItem.Text = "2";
+			this.LoadState2MenuItem.Click += new System.EventHandler(this.Loadstate2MenuItem_Click);
+			// 
+			// LoadState3MenuItem
+			// 
+			this.LoadState3MenuItem.Name = "LoadState3MenuItem";
+			this.LoadState3MenuItem.Size = new System.Drawing.Size(174, 22);
+			this.LoadState3MenuItem.Text = "3";
+			this.LoadState3MenuItem.Click += new System.EventHandler(this.Loadstate3MenuItem_Click);
+			// 
+			// LoadState4MenuItem
+			// 
+			this.LoadState4MenuItem.Name = "LoadState4MenuItem";
+			this.LoadState4MenuItem.Size = new System.Drawing.Size(174, 22);
+			this.LoadState4MenuItem.Text = "4";
+			this.LoadState4MenuItem.Click += new System.EventHandler(this.Loadstate4MenuItem_Click);
+			// 
+			// LoadState5MenuItem
+			// 
+			this.LoadState5MenuItem.Name = "LoadState5MenuItem";
+			this.LoadState5MenuItem.Size = new System.Drawing.Size(174, 22);
+			this.LoadState5MenuItem.Text = "5";
+			this.LoadState5MenuItem.Click += new System.EventHandler(this.Loadstate5MenuItem_Click);
+			// 
+			// LoadState6MenuItem
+			// 
+			this.LoadState6MenuItem.Name = "LoadState6MenuItem";
+			this.LoadState6MenuItem.Size = new System.Drawing.Size(174, 22);
+			this.LoadState6MenuItem.Text = "6";
+			this.LoadState6MenuItem.Click += new System.EventHandler(this.Loadstate6MenuItem_Click);
+			// 
+			// LoadState7MenuItem
+			// 
+			this.LoadState7MenuItem.Name = "LoadState7MenuItem";
+			this.LoadState7MenuItem.Size = new System.Drawing.Size(174, 22);
+			this.LoadState7MenuItem.Text = "7";
+			this.LoadState7MenuItem.Click += new System.EventHandler(this.Loadstate7MenuItem_Click);
+			// 
+			// LoadState8MenuItem
+			// 
+			this.LoadState8MenuItem.Name = "LoadState8MenuItem";
+			this.LoadState8MenuItem.Size = new System.Drawing.Size(174, 22);
+			this.LoadState8MenuItem.Text = "8";
+			this.LoadState8MenuItem.Click += new System.EventHandler(this.Loadstate8MenuItem_Click);
+			// 
+			// LoadState9MenuItem
+			// 
+			this.LoadState9MenuItem.Name = "LoadState9MenuItem";
+			this.LoadState9MenuItem.Size = new System.Drawing.Size(174, 22);
+			this.LoadState9MenuItem.Text = "9";
+			this.LoadState9MenuItem.Click += new System.EventHandler(this.Loadstate9MenuItem_Click);
+			// 
+			// LoadState0MenuItem
+			// 
+			this.LoadState0MenuItem.Name = "LoadState0MenuItem";
+			this.LoadState0MenuItem.Size = new System.Drawing.Size(174, 22);
+			this.LoadState0MenuItem.Text = "0";
+			this.LoadState0MenuItem.Click += new System.EventHandler(this.Loadstate0MenuItem_Click);
+			// 
+			// toolStripSeparator7
+			// 
+			this.toolStripSeparator7.Name = "toolStripSeparator7";
+			this.toolStripSeparator7.Size = new System.Drawing.Size(171, 6);
+			// 
+			// LoadNamedStateMenuItem
+			// 
+			this.LoadNamedStateMenuItem.Name = "LoadNamedStateMenuItem";
+			this.LoadNamedStateMenuItem.Size = new System.Drawing.Size(174, 22);
+			this.LoadNamedStateMenuItem.Text = "Load Named State...";
+			this.LoadNamedStateMenuItem.Click += new System.EventHandler(this.LoadNamedStateMenuItem_Click);
+			// 
+			// toolStripSeparator21
+			// 
+			this.toolStripSeparator21.Name = "toolStripSeparator21";
+			this.toolStripSeparator21.Size = new System.Drawing.Size(171, 6);
+			// 
+			// AutoloadLastSlotMenuItem
+			// 
+			this.AutoloadLastSlotMenuItem.Name = "AutoloadLastSlotMenuItem";
+			this.AutoloadLastSlotMenuItem.Size = new System.Drawing.Size(174, 22);
+			this.AutoloadLastSlotMenuItem.Text = "Autoload last Slot";
+			this.AutoloadLastSlotMenuItem.Click += new System.EventHandler(this.AutoloadLastSlotMenuItem_Click);
+			// 
+			// SaveSlotSubMenu
+			// 
+			this.SaveSlotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.SelectSlot0MenuItem,
             this.SelectSlot1MenuItem,
             this.SelectSlot2MenuItem,
@@ -741,141 +742,141 @@
             this.toolStripSeparator5,
             this.SaveToCurrentSlotMenuItem,
             this.LoadCurrentSlotMenuItem});
-            this.SaveSlotSubMenu.Name = "SaveSlotSubMenu";
-            this.SaveSlotSubMenu.Size = new System.Drawing.Size(152, 22);
-            this.SaveSlotSubMenu.Text = "Save Slot";
-            this.SaveSlotSubMenu.DropDownOpened += new System.EventHandler(this.SaveSlotSubMenu_DropDownOpened);
-            // 
-            // SelectSlot0MenuItem
-            // 
-            this.SelectSlot0MenuItem.Name = "SelectSlot0MenuItem";
-            this.SelectSlot0MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SelectSlot0MenuItem.Text = "Select Slot 0";
-            this.SelectSlot0MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
-            // 
-            // SelectSlot1MenuItem
-            // 
-            this.SelectSlot1MenuItem.Name = "SelectSlot1MenuItem";
-            this.SelectSlot1MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SelectSlot1MenuItem.Text = "Select Slot 1";
-            this.SelectSlot1MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
-            // 
-            // SelectSlot2MenuItem
-            // 
-            this.SelectSlot2MenuItem.Name = "SelectSlot2MenuItem";
-            this.SelectSlot2MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SelectSlot2MenuItem.Text = "Select Slot 2";
-            this.SelectSlot2MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
-            // 
-            // SelectSlot3MenuItem
-            // 
-            this.SelectSlot3MenuItem.Name = "SelectSlot3MenuItem";
-            this.SelectSlot3MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SelectSlot3MenuItem.Text = "Select Slot 3";
-            this.SelectSlot3MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
-            // 
-            // SelectSlot4MenuItem
-            // 
-            this.SelectSlot4MenuItem.Name = "SelectSlot4MenuItem";
-            this.SelectSlot4MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SelectSlot4MenuItem.Text = "Select Slot 4";
-            this.SelectSlot4MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
-            // 
-            // SelectSlot5MenuItem
-            // 
-            this.SelectSlot5MenuItem.Name = "SelectSlot5MenuItem";
-            this.SelectSlot5MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SelectSlot5MenuItem.Text = "Select Slot 5";
-            this.SelectSlot5MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
-            // 
-            // SelectSlot6MenuItem
-            // 
-            this.SelectSlot6MenuItem.Name = "SelectSlot6MenuItem";
-            this.SelectSlot6MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SelectSlot6MenuItem.Text = "Select Slot 6";
-            this.SelectSlot6MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
-            // 
-            // SelectSlot7MenuItem
-            // 
-            this.SelectSlot7MenuItem.Name = "SelectSlot7MenuItem";
-            this.SelectSlot7MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SelectSlot7MenuItem.Text = "Select Slot 7";
-            this.SelectSlot7MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
-            // 
-            // SelectSlot8MenuItem
-            // 
-            this.SelectSlot8MenuItem.Name = "SelectSlot8MenuItem";
-            this.SelectSlot8MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SelectSlot8MenuItem.Text = "Select Slot 8";
-            this.SelectSlot8MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
-            // 
-            // SelectSlot9MenuItem
-            // 
-            this.SelectSlot9MenuItem.Name = "SelectSlot9MenuItem";
-            this.SelectSlot9MenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SelectSlot9MenuItem.Text = "Select Slot 9";
-            this.SelectSlot9MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
-            // 
-            // PreviousSlotMenuItem
-            // 
-            this.PreviousSlotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveLeft;
-            this.PreviousSlotMenuItem.Name = "PreviousSlotMenuItem";
-            this.PreviousSlotMenuItem.Size = new System.Drawing.Size(178, 22);
-            this.PreviousSlotMenuItem.Text = "Previous Slot";
-            this.PreviousSlotMenuItem.Click += new System.EventHandler(this.PreviousSlotMenuItem_Click);
-            // 
-            // NextSlotMenuItem
-            // 
-            this.NextSlotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveRight;
-            this.NextSlotMenuItem.Name = "NextSlotMenuItem";
-            this.NextSlotMenuItem.Size = new System.Drawing.Size(178, 22);
-            this.NextSlotMenuItem.Text = "Next Slot";
-            this.NextSlotMenuItem.Click += new System.EventHandler(this.NextSlotMenuItem_Click);
-            // 
-            // toolStripSeparator5
-            // 
-            this.toolStripSeparator5.Name = "toolStripSeparator5";
-            this.toolStripSeparator5.Size = new System.Drawing.Size(175, 6);
-            // 
-            // SaveToCurrentSlotMenuItem
-            // 
-            this.SaveToCurrentSlotMenuItem.Name = "SaveToCurrentSlotMenuItem";
-            this.SaveToCurrentSlotMenuItem.Size = new System.Drawing.Size(178, 22);
-            this.SaveToCurrentSlotMenuItem.Text = "Save to Current Slot";
-            this.SaveToCurrentSlotMenuItem.Click += new System.EventHandler(this.SaveToCurrentSlotMenuItem_Click);
-            // 
-            // LoadCurrentSlotMenuItem
-            // 
-            this.LoadCurrentSlotMenuItem.Name = "LoadCurrentSlotMenuItem";
-            this.LoadCurrentSlotMenuItem.Size = new System.Drawing.Size(178, 22);
-            this.LoadCurrentSlotMenuItem.Text = "Load Current Slot";
-            this.LoadCurrentSlotMenuItem.Click += new System.EventHandler(this.LoadCurrentSlotMenuItem_Click);
-            // 
-            // SaveRAMSubMenu
-            // 
-            this.SaveRAMSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.SaveSlotSubMenu.Name = "SaveSlotSubMenu";
+			this.SaveSlotSubMenu.Size = new System.Drawing.Size(134, 22);
+			this.SaveSlotSubMenu.Text = "Save Slot";
+			this.SaveSlotSubMenu.DropDownOpened += new System.EventHandler(this.SaveSlotSubMenu_DropDownOpened);
+			// 
+			// SelectSlot0MenuItem
+			// 
+			this.SelectSlot0MenuItem.Name = "SelectSlot0MenuItem";
+			this.SelectSlot0MenuItem.Size = new System.Drawing.Size(172, 22);
+			this.SelectSlot0MenuItem.Text = "Select Slot 0";
+			this.SelectSlot0MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
+			// 
+			// SelectSlot1MenuItem
+			// 
+			this.SelectSlot1MenuItem.Name = "SelectSlot1MenuItem";
+			this.SelectSlot1MenuItem.Size = new System.Drawing.Size(172, 22);
+			this.SelectSlot1MenuItem.Text = "Select Slot 1";
+			this.SelectSlot1MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
+			// 
+			// SelectSlot2MenuItem
+			// 
+			this.SelectSlot2MenuItem.Name = "SelectSlot2MenuItem";
+			this.SelectSlot2MenuItem.Size = new System.Drawing.Size(172, 22);
+			this.SelectSlot2MenuItem.Text = "Select Slot 2";
+			this.SelectSlot2MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
+			// 
+			// SelectSlot3MenuItem
+			// 
+			this.SelectSlot3MenuItem.Name = "SelectSlot3MenuItem";
+			this.SelectSlot3MenuItem.Size = new System.Drawing.Size(172, 22);
+			this.SelectSlot3MenuItem.Text = "Select Slot 3";
+			this.SelectSlot3MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
+			// 
+			// SelectSlot4MenuItem
+			// 
+			this.SelectSlot4MenuItem.Name = "SelectSlot4MenuItem";
+			this.SelectSlot4MenuItem.Size = new System.Drawing.Size(172, 22);
+			this.SelectSlot4MenuItem.Text = "Select Slot 4";
+			this.SelectSlot4MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
+			// 
+			// SelectSlot5MenuItem
+			// 
+			this.SelectSlot5MenuItem.Name = "SelectSlot5MenuItem";
+			this.SelectSlot5MenuItem.Size = new System.Drawing.Size(172, 22);
+			this.SelectSlot5MenuItem.Text = "Select Slot 5";
+			this.SelectSlot5MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
+			// 
+			// SelectSlot6MenuItem
+			// 
+			this.SelectSlot6MenuItem.Name = "SelectSlot6MenuItem";
+			this.SelectSlot6MenuItem.Size = new System.Drawing.Size(172, 22);
+			this.SelectSlot6MenuItem.Text = "Select Slot 6";
+			this.SelectSlot6MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
+			// 
+			// SelectSlot7MenuItem
+			// 
+			this.SelectSlot7MenuItem.Name = "SelectSlot7MenuItem";
+			this.SelectSlot7MenuItem.Size = new System.Drawing.Size(172, 22);
+			this.SelectSlot7MenuItem.Text = "Select Slot 7";
+			this.SelectSlot7MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
+			// 
+			// SelectSlot8MenuItem
+			// 
+			this.SelectSlot8MenuItem.Name = "SelectSlot8MenuItem";
+			this.SelectSlot8MenuItem.Size = new System.Drawing.Size(172, 22);
+			this.SelectSlot8MenuItem.Text = "Select Slot 8";
+			this.SelectSlot8MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
+			// 
+			// SelectSlot9MenuItem
+			// 
+			this.SelectSlot9MenuItem.Name = "SelectSlot9MenuItem";
+			this.SelectSlot9MenuItem.Size = new System.Drawing.Size(172, 22);
+			this.SelectSlot9MenuItem.Text = "Select Slot 9";
+			this.SelectSlot9MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click);
+			// 
+			// PreviousSlotMenuItem
+			// 
+			this.PreviousSlotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveLeft;
+			this.PreviousSlotMenuItem.Name = "PreviousSlotMenuItem";
+			this.PreviousSlotMenuItem.Size = new System.Drawing.Size(172, 22);
+			this.PreviousSlotMenuItem.Text = "Previous Slot";
+			this.PreviousSlotMenuItem.Click += new System.EventHandler(this.PreviousSlotMenuItem_Click);
+			// 
+			// NextSlotMenuItem
+			// 
+			this.NextSlotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveRight;
+			this.NextSlotMenuItem.Name = "NextSlotMenuItem";
+			this.NextSlotMenuItem.Size = new System.Drawing.Size(172, 22);
+			this.NextSlotMenuItem.Text = "Next Slot";
+			this.NextSlotMenuItem.Click += new System.EventHandler(this.NextSlotMenuItem_Click);
+			// 
+			// toolStripSeparator5
+			// 
+			this.toolStripSeparator5.Name = "toolStripSeparator5";
+			this.toolStripSeparator5.Size = new System.Drawing.Size(169, 6);
+			// 
+			// SaveToCurrentSlotMenuItem
+			// 
+			this.SaveToCurrentSlotMenuItem.Name = "SaveToCurrentSlotMenuItem";
+			this.SaveToCurrentSlotMenuItem.Size = new System.Drawing.Size(172, 22);
+			this.SaveToCurrentSlotMenuItem.Text = "Save to Current Slot";
+			this.SaveToCurrentSlotMenuItem.Click += new System.EventHandler(this.SaveToCurrentSlotMenuItem_Click);
+			// 
+			// LoadCurrentSlotMenuItem
+			// 
+			this.LoadCurrentSlotMenuItem.Name = "LoadCurrentSlotMenuItem";
+			this.LoadCurrentSlotMenuItem.Size = new System.Drawing.Size(172, 22);
+			this.LoadCurrentSlotMenuItem.Text = "Load Current Slot";
+			this.LoadCurrentSlotMenuItem.Click += new System.EventHandler(this.LoadCurrentSlotMenuItem_Click);
+			// 
+			// SaveRAMSubMenu
+			// 
+			this.SaveRAMSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.FlushSaveRAMMenuItem});
-            this.SaveRAMSubMenu.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold);
-            this.SaveRAMSubMenu.Name = "SaveRAMSubMenu";
-            this.SaveRAMSubMenu.Size = new System.Drawing.Size(152, 22);
-            this.SaveRAMSubMenu.Text = "Save RAM";
-            // 
-            // FlushSaveRAMMenuItem
-            // 
-            this.FlushSaveRAMMenuItem.Font = new System.Drawing.Font("Tahoma", 8.25F);
-            this.FlushSaveRAMMenuItem.Name = "FlushSaveRAMMenuItem";
-            this.FlushSaveRAMMenuItem.Size = new System.Drawing.Size(150, 22);
-            this.FlushSaveRAMMenuItem.Text = "&Flush Save Ram";
-            this.FlushSaveRAMMenuItem.Click += new System.EventHandler(this.FlushSaveRAMMenuItem_Click);
-            // 
-            // toolStripMenuItem2
-            // 
-            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6);
-            // 
-            // MovieSubMenu
-            // 
-            this.MovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.SaveRAMSubMenu.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold);
+			this.SaveRAMSubMenu.Name = "SaveRAMSubMenu";
+			this.SaveRAMSubMenu.Size = new System.Drawing.Size(134, 22);
+			this.SaveRAMSubMenu.Text = "Save RAM";
+			// 
+			// FlushSaveRAMMenuItem
+			// 
+			this.FlushSaveRAMMenuItem.Font = new System.Drawing.Font("Tahoma", 8.25F);
+			this.FlushSaveRAMMenuItem.Name = "FlushSaveRAMMenuItem";
+			this.FlushSaveRAMMenuItem.Size = new System.Drawing.Size(150, 22);
+			this.FlushSaveRAMMenuItem.Text = "&Flush Save Ram";
+			this.FlushSaveRAMMenuItem.Click += new System.EventHandler(this.FlushSaveRAMMenuItem_Click);
+			// 
+			// toolStripMenuItem2
+			// 
+			this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+			this.toolStripMenuItem2.Size = new System.Drawing.Size(131, 6);
+			// 
+			// MovieSubMenu
+			// 
+			this.MovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ReadonlyMenuItem,
             this.toolStripSeparator15,
             this.RecentMovieSubMenu,
@@ -890,324 +891,324 @@
             this.AutomaticallyBackupMoviesMenuItem,
             this.FullMovieLoadstatesMenuItem,
             this.MovieEndSubMenu});
-            this.MovieSubMenu.Name = "MovieSubMenu";
-            this.MovieSubMenu.Size = new System.Drawing.Size(152, 22);
-            this.MovieSubMenu.Text = "Movie";
-            this.MovieSubMenu.DropDownOpened += new System.EventHandler(this.MovieSubMenu_DropDownOpened);
-            // 
-            // ReadonlyMenuItem
-            // 
-            this.ReadonlyMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ReadOnly;
-            this.ReadonlyMenuItem.Name = "ReadonlyMenuItem";
-            this.ReadonlyMenuItem.Size = new System.Drawing.Size(231, 22);
-            this.ReadonlyMenuItem.Text = "Read-only";
-            this.ReadonlyMenuItem.Click += new System.EventHandler(this.ReadonlyMenuItem_Click);
-            // 
-            // toolStripSeparator15
-            // 
-            this.toolStripSeparator15.Name = "toolStripSeparator15";
-            this.toolStripSeparator15.Size = new System.Drawing.Size(228, 6);
-            // 
-            // RecentMovieSubMenu
-            // 
-            this.RecentMovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.MovieSubMenu.Name = "MovieSubMenu";
+			this.MovieSubMenu.Size = new System.Drawing.Size(134, 22);
+			this.MovieSubMenu.Text = "Movie";
+			this.MovieSubMenu.DropDownOpened += new System.EventHandler(this.MovieSubMenu_DropDownOpened);
+			// 
+			// ReadonlyMenuItem
+			// 
+			this.ReadonlyMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ReadOnly;
+			this.ReadonlyMenuItem.Name = "ReadonlyMenuItem";
+			this.ReadonlyMenuItem.Size = new System.Drawing.Size(211, 22);
+			this.ReadonlyMenuItem.Text = "Read-only";
+			this.ReadonlyMenuItem.Click += new System.EventHandler(this.ReadonlyMenuItem_Click);
+			// 
+			// toolStripSeparator15
+			// 
+			this.toolStripSeparator15.Name = "toolStripSeparator15";
+			this.toolStripSeparator15.Size = new System.Drawing.Size(208, 6);
+			// 
+			// RecentMovieSubMenu
+			// 
+			this.RecentMovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripSeparator16});
-            this.RecentMovieSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
-            this.RecentMovieSubMenu.Name = "RecentMovieSubMenu";
-            this.RecentMovieSubMenu.Size = new System.Drawing.Size(231, 22);
-            this.RecentMovieSubMenu.Text = "Recent";
-            this.RecentMovieSubMenu.DropDownOpened += new System.EventHandler(this.RecentMovieSubMenu_DropDownOpened);
-            // 
-            // toolStripSeparator16
-            // 
-            this.toolStripSeparator16.Name = "toolStripSeparator16";
-            this.toolStripSeparator16.Size = new System.Drawing.Size(57, 6);
-            // 
-            // RecordMovieMenuItem
-            // 
-            this.RecordMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS;
-            this.RecordMovieMenuItem.Name = "RecordMovieMenuItem";
-            this.RecordMovieMenuItem.Size = new System.Drawing.Size(231, 22);
-            this.RecordMovieMenuItem.Text = "&Record Movie...";
-            this.RecordMovieMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click);
-            // 
-            // PlayMovieMenuItem
-            // 
-            this.PlayMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play;
-            this.PlayMovieMenuItem.Name = "PlayMovieMenuItem";
-            this.PlayMovieMenuItem.Size = new System.Drawing.Size(231, 22);
-            this.PlayMovieMenuItem.Text = "&Play Movie...";
-            this.PlayMovieMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click);
-            // 
-            // StopMovieMenuItem
-            // 
-            this.StopMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
-            this.StopMovieMenuItem.Name = "StopMovieMenuItem";
-            this.StopMovieMenuItem.Size = new System.Drawing.Size(231, 22);
-            this.StopMovieMenuItem.Text = "Stop Movie";
-            this.StopMovieMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click);
-            // 
-            // PlayFromBeginningMenuItem
-            // 
-            this.PlayFromBeginningMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart;
-            this.PlayFromBeginningMenuItem.Name = "PlayFromBeginningMenuItem";
-            this.PlayFromBeginningMenuItem.Size = new System.Drawing.Size(231, 22);
-            this.PlayFromBeginningMenuItem.Text = "Play from Beginning";
-            this.PlayFromBeginningMenuItem.Click += new System.EventHandler(this.PlayFromBeginningMenuItem_Click);
-            // 
-            // ImportMoviesMenuItem
-            // 
-            this.ImportMoviesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Import;
-            this.ImportMoviesMenuItem.Name = "ImportMoviesMenuItem";
-            this.ImportMoviesMenuItem.Size = new System.Drawing.Size(231, 22);
-            this.ImportMoviesMenuItem.Text = "Import Movies...";
-            this.ImportMoviesMenuItem.Click += new System.EventHandler(this.ImportMovieMenuItem_Click);
-            // 
-            // SaveMovieMenuItem
-            // 
-            this.SaveMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
-            this.SaveMovieMenuItem.Name = "SaveMovieMenuItem";
-            this.SaveMovieMenuItem.Size = new System.Drawing.Size(231, 22);
-            this.SaveMovieMenuItem.Text = "&Save Movie";
-            this.SaveMovieMenuItem.Click += new System.EventHandler(this.SaveMovieMenuItem_Click);
-            // 
-            // StopMovieWithoutSavingMenuItem
-            // 
-            this.StopMovieWithoutSavingMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
-            this.StopMovieWithoutSavingMenuItem.Name = "StopMovieWithoutSavingMenuItem";
-            this.StopMovieWithoutSavingMenuItem.Size = new System.Drawing.Size(231, 22);
-            this.StopMovieWithoutSavingMenuItem.Text = "Stop Movie without Saving";
-            this.StopMovieWithoutSavingMenuItem.Click += new System.EventHandler(this.StopMovieWithoutSavingMenuItem_Click);
-            // 
-            // toolStripSeparator14
-            // 
-            this.toolStripSeparator14.Name = "toolStripSeparator14";
-            this.toolStripSeparator14.Size = new System.Drawing.Size(228, 6);
-            // 
-            // AutomaticallyBackupMoviesMenuItem
-            // 
-            this.AutomaticallyBackupMoviesMenuItem.Name = "AutomaticallyBackupMoviesMenuItem";
-            this.AutomaticallyBackupMoviesMenuItem.Size = new System.Drawing.Size(231, 22);
-            this.AutomaticallyBackupMoviesMenuItem.Text = "Automatically Backup Movies";
-            this.AutomaticallyBackupMoviesMenuItem.Click += new System.EventHandler(this.AutomaticMovieBackupMenuItem_Click);
-            // 
-            // FullMovieLoadstatesMenuItem
-            // 
-            this.FullMovieLoadstatesMenuItem.Name = "FullMovieLoadstatesMenuItem";
-            this.FullMovieLoadstatesMenuItem.Size = new System.Drawing.Size(231, 22);
-            this.FullMovieLoadstatesMenuItem.Text = "Full Movie Loadstates";
-            this.FullMovieLoadstatesMenuItem.Click += new System.EventHandler(this.FullMovieLoadstatesMenuItem_Click);
-            // 
-            // MovieEndSubMenu
-            // 
-            this.MovieEndSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.RecentMovieSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
+			this.RecentMovieSubMenu.Name = "RecentMovieSubMenu";
+			this.RecentMovieSubMenu.Size = new System.Drawing.Size(211, 22);
+			this.RecentMovieSubMenu.Text = "Recent";
+			this.RecentMovieSubMenu.DropDownOpened += new System.EventHandler(this.RecentMovieSubMenu_DropDownOpened);
+			// 
+			// toolStripSeparator16
+			// 
+			this.toolStripSeparator16.Name = "toolStripSeparator16";
+			this.toolStripSeparator16.Size = new System.Drawing.Size(57, 6);
+			// 
+			// RecordMovieMenuItem
+			// 
+			this.RecordMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS;
+			this.RecordMovieMenuItem.Name = "RecordMovieMenuItem";
+			this.RecordMovieMenuItem.Size = new System.Drawing.Size(211, 22);
+			this.RecordMovieMenuItem.Text = "&Record Movie...";
+			this.RecordMovieMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click);
+			// 
+			// PlayMovieMenuItem
+			// 
+			this.PlayMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play;
+			this.PlayMovieMenuItem.Name = "PlayMovieMenuItem";
+			this.PlayMovieMenuItem.Size = new System.Drawing.Size(211, 22);
+			this.PlayMovieMenuItem.Text = "&Play Movie...";
+			this.PlayMovieMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click);
+			// 
+			// StopMovieMenuItem
+			// 
+			this.StopMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
+			this.StopMovieMenuItem.Name = "StopMovieMenuItem";
+			this.StopMovieMenuItem.Size = new System.Drawing.Size(211, 22);
+			this.StopMovieMenuItem.Text = "Stop Movie";
+			this.StopMovieMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click);
+			// 
+			// PlayFromBeginningMenuItem
+			// 
+			this.PlayFromBeginningMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart;
+			this.PlayFromBeginningMenuItem.Name = "PlayFromBeginningMenuItem";
+			this.PlayFromBeginningMenuItem.Size = new System.Drawing.Size(211, 22);
+			this.PlayFromBeginningMenuItem.Text = "Play from Beginning";
+			this.PlayFromBeginningMenuItem.Click += new System.EventHandler(this.PlayFromBeginningMenuItem_Click);
+			// 
+			// ImportMoviesMenuItem
+			// 
+			this.ImportMoviesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Import;
+			this.ImportMoviesMenuItem.Name = "ImportMoviesMenuItem";
+			this.ImportMoviesMenuItem.Size = new System.Drawing.Size(211, 22);
+			this.ImportMoviesMenuItem.Text = "Import Movies...";
+			this.ImportMoviesMenuItem.Click += new System.EventHandler(this.ImportMovieMenuItem_Click);
+			// 
+			// SaveMovieMenuItem
+			// 
+			this.SaveMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
+			this.SaveMovieMenuItem.Name = "SaveMovieMenuItem";
+			this.SaveMovieMenuItem.Size = new System.Drawing.Size(211, 22);
+			this.SaveMovieMenuItem.Text = "&Save Movie";
+			this.SaveMovieMenuItem.Click += new System.EventHandler(this.SaveMovieMenuItem_Click);
+			// 
+			// StopMovieWithoutSavingMenuItem
+			// 
+			this.StopMovieWithoutSavingMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
+			this.StopMovieWithoutSavingMenuItem.Name = "StopMovieWithoutSavingMenuItem";
+			this.StopMovieWithoutSavingMenuItem.Size = new System.Drawing.Size(211, 22);
+			this.StopMovieWithoutSavingMenuItem.Text = "Stop Movie without Saving";
+			this.StopMovieWithoutSavingMenuItem.Click += new System.EventHandler(this.StopMovieWithoutSavingMenuItem_Click);
+			// 
+			// toolStripSeparator14
+			// 
+			this.toolStripSeparator14.Name = "toolStripSeparator14";
+			this.toolStripSeparator14.Size = new System.Drawing.Size(208, 6);
+			// 
+			// AutomaticallyBackupMoviesMenuItem
+			// 
+			this.AutomaticallyBackupMoviesMenuItem.Name = "AutomaticallyBackupMoviesMenuItem";
+			this.AutomaticallyBackupMoviesMenuItem.Size = new System.Drawing.Size(211, 22);
+			this.AutomaticallyBackupMoviesMenuItem.Text = "Automatically Backup Movies";
+			this.AutomaticallyBackupMoviesMenuItem.Click += new System.EventHandler(this.AutomaticMovieBackupMenuItem_Click);
+			// 
+			// FullMovieLoadstatesMenuItem
+			// 
+			this.FullMovieLoadstatesMenuItem.Name = "FullMovieLoadstatesMenuItem";
+			this.FullMovieLoadstatesMenuItem.Size = new System.Drawing.Size(211, 22);
+			this.FullMovieLoadstatesMenuItem.Text = "Full Movie Loadstates";
+			this.FullMovieLoadstatesMenuItem.Click += new System.EventHandler(this.FullMovieLoadstatesMenuItem_Click);
+			// 
+			// MovieEndSubMenu
+			// 
+			this.MovieEndSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.MovieEndFinishMenuItem,
             this.MovieEndRecordMenuItem,
             this.MovieEndStopMenuItem,
             this.MovieEndPauseMenuItem});
-            this.MovieEndSubMenu.Name = "MovieEndSubMenu";
-            this.MovieEndSubMenu.Size = new System.Drawing.Size(231, 22);
-            this.MovieEndSubMenu.Text = "On Movie End";
-            this.MovieEndSubMenu.DropDownOpened += new System.EventHandler(this.MovieEndSubMenu_DropDownOpened);
-            // 
-            // MovieEndFinishMenuItem
-            // 
-            this.MovieEndFinishMenuItem.Name = "MovieEndFinishMenuItem";
-            this.MovieEndFinishMenuItem.Size = new System.Drawing.Size(170, 22);
-            this.MovieEndFinishMenuItem.Text = "Switch to Finished";
-            this.MovieEndFinishMenuItem.Click += new System.EventHandler(this.MovieEndFinishMenuItem_Click);
-            // 
-            // MovieEndRecordMenuItem
-            // 
-            this.MovieEndRecordMenuItem.Name = "MovieEndRecordMenuItem";
-            this.MovieEndRecordMenuItem.Size = new System.Drawing.Size(170, 22);
-            this.MovieEndRecordMenuItem.Text = "Switch To Record";
-            this.MovieEndRecordMenuItem.Click += new System.EventHandler(this.MovieEndRecordMenuItem_Click);
-            // 
-            // MovieEndStopMenuItem
-            // 
-            this.MovieEndStopMenuItem.Name = "MovieEndStopMenuItem";
-            this.MovieEndStopMenuItem.Size = new System.Drawing.Size(170, 22);
-            this.MovieEndStopMenuItem.Text = "Stop";
-            this.MovieEndStopMenuItem.Click += new System.EventHandler(this.MovieEndStopMenuItem_Click);
-            // 
-            // MovieEndPauseMenuItem
-            // 
-            this.MovieEndPauseMenuItem.Name = "MovieEndPauseMenuItem";
-            this.MovieEndPauseMenuItem.Size = new System.Drawing.Size(170, 22);
-            this.MovieEndPauseMenuItem.Text = "Pause";
-            this.MovieEndPauseMenuItem.Click += new System.EventHandler(this.MovieEndPauseMenuItem_Click);
-            // 
-            // AVSubMenu
-            // 
-            this.AVSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.MovieEndSubMenu.Name = "MovieEndSubMenu";
+			this.MovieEndSubMenu.Size = new System.Drawing.Size(211, 22);
+			this.MovieEndSubMenu.Text = "On Movie End";
+			this.MovieEndSubMenu.DropDownOpened += new System.EventHandler(this.MovieEndSubMenu_DropDownOpened);
+			// 
+			// MovieEndFinishMenuItem
+			// 
+			this.MovieEndFinishMenuItem.Name = "MovieEndFinishMenuItem";
+			this.MovieEndFinishMenuItem.Size = new System.Drawing.Size(160, 22);
+			this.MovieEndFinishMenuItem.Text = "Switch to Finished";
+			this.MovieEndFinishMenuItem.Click += new System.EventHandler(this.MovieEndFinishMenuItem_Click);
+			// 
+			// MovieEndRecordMenuItem
+			// 
+			this.MovieEndRecordMenuItem.Name = "MovieEndRecordMenuItem";
+			this.MovieEndRecordMenuItem.Size = new System.Drawing.Size(160, 22);
+			this.MovieEndRecordMenuItem.Text = "Switch To Record";
+			this.MovieEndRecordMenuItem.Click += new System.EventHandler(this.MovieEndRecordMenuItem_Click);
+			// 
+			// MovieEndStopMenuItem
+			// 
+			this.MovieEndStopMenuItem.Name = "MovieEndStopMenuItem";
+			this.MovieEndStopMenuItem.Size = new System.Drawing.Size(160, 22);
+			this.MovieEndStopMenuItem.Text = "Stop";
+			this.MovieEndStopMenuItem.Click += new System.EventHandler(this.MovieEndStopMenuItem_Click);
+			// 
+			// MovieEndPauseMenuItem
+			// 
+			this.MovieEndPauseMenuItem.Name = "MovieEndPauseMenuItem";
+			this.MovieEndPauseMenuItem.Size = new System.Drawing.Size(160, 22);
+			this.MovieEndPauseMenuItem.Text = "Pause";
+			this.MovieEndPauseMenuItem.Click += new System.EventHandler(this.MovieEndPauseMenuItem_Click);
+			// 
+			// AVSubMenu
+			// 
+			this.AVSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.RecordAVMenuItem,
             this.StopAVIMenuItem,
             this.toolStripSeparator19,
             this.CaptureOSDMenuItem,
             this.SynclessRecordingMenuItem});
-            this.AVSubMenu.Name = "AVSubMenu";
-            this.AVSubMenu.Size = new System.Drawing.Size(152, 22);
-            this.AVSubMenu.Text = "AVI/WAV";
-            this.AVSubMenu.DropDownOpened += new System.EventHandler(this.AVSubMenu_DropDownOpened);
-            // 
-            // RecordAVMenuItem
-            // 
-            this.RecordAVMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AVI;
-            this.RecordAVMenuItem.Name = "RecordAVMenuItem";
-            this.RecordAVMenuItem.Size = new System.Drawing.Size(206, 22);
-            this.RecordAVMenuItem.Text = "&Record AVI/WAV";
-            this.RecordAVMenuItem.Click += new System.EventHandler(this.RecordAVMenuItem_Click);
-            // 
-            // StopAVIMenuItem
-            // 
-            this.StopAVIMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
-            this.StopAVIMenuItem.Name = "StopAVIMenuItem";
-            this.StopAVIMenuItem.Size = new System.Drawing.Size(206, 22);
-            this.StopAVIMenuItem.Text = "&Stop AVI/WAV";
-            this.StopAVIMenuItem.Click += new System.EventHandler(this.StopAVMenuItem_Click);
-            // 
-            // toolStripSeparator19
-            // 
-            this.toolStripSeparator19.Name = "toolStripSeparator19";
-            this.toolStripSeparator19.Size = new System.Drawing.Size(203, 6);
-            // 
-            // CaptureOSDMenuItem
-            // 
-            this.CaptureOSDMenuItem.Name = "CaptureOSDMenuItem";
-            this.CaptureOSDMenuItem.Size = new System.Drawing.Size(206, 22);
-            this.CaptureOSDMenuItem.Text = "Capture OSD";
-            this.CaptureOSDMenuItem.Click += new System.EventHandler(this.CaptureOSDMenuItem_Click);
-            // 
-            // SynclessRecordingMenuItem
-            // 
-            this.SynclessRecordingMenuItem.Name = "SynclessRecordingMenuItem";
-            this.SynclessRecordingMenuItem.Size = new System.Drawing.Size(206, 22);
-            this.SynclessRecordingMenuItem.Text = "S&yncless Recording Tools";
-            this.SynclessRecordingMenuItem.Click += new System.EventHandler(this.SynclessRecordingMenuItem_Click);
-            // 
-            // ScreenshotSubMenu
-            // 
-            this.ScreenshotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.AVSubMenu.Name = "AVSubMenu";
+			this.AVSubMenu.Size = new System.Drawing.Size(134, 22);
+			this.AVSubMenu.Text = "AVI/WAV";
+			this.AVSubMenu.DropDownOpened += new System.EventHandler(this.AVSubMenu_DropDownOpened);
+			// 
+			// RecordAVMenuItem
+			// 
+			this.RecordAVMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AVI;
+			this.RecordAVMenuItem.Name = "RecordAVMenuItem";
+			this.RecordAVMenuItem.Size = new System.Drawing.Size(194, 22);
+			this.RecordAVMenuItem.Text = "&Record AVI/WAV";
+			this.RecordAVMenuItem.Click += new System.EventHandler(this.RecordAVMenuItem_Click);
+			// 
+			// StopAVIMenuItem
+			// 
+			this.StopAVIMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
+			this.StopAVIMenuItem.Name = "StopAVIMenuItem";
+			this.StopAVIMenuItem.Size = new System.Drawing.Size(194, 22);
+			this.StopAVIMenuItem.Text = "&Stop AVI/WAV";
+			this.StopAVIMenuItem.Click += new System.EventHandler(this.StopAVMenuItem_Click);
+			// 
+			// toolStripSeparator19
+			// 
+			this.toolStripSeparator19.Name = "toolStripSeparator19";
+			this.toolStripSeparator19.Size = new System.Drawing.Size(191, 6);
+			// 
+			// CaptureOSDMenuItem
+			// 
+			this.CaptureOSDMenuItem.Name = "CaptureOSDMenuItem";
+			this.CaptureOSDMenuItem.Size = new System.Drawing.Size(194, 22);
+			this.CaptureOSDMenuItem.Text = "Capture OSD";
+			this.CaptureOSDMenuItem.Click += new System.EventHandler(this.CaptureOSDMenuItem_Click);
+			// 
+			// SynclessRecordingMenuItem
+			// 
+			this.SynclessRecordingMenuItem.Name = "SynclessRecordingMenuItem";
+			this.SynclessRecordingMenuItem.Size = new System.Drawing.Size(194, 22);
+			this.SynclessRecordingMenuItem.Text = "S&yncless Recording Tools";
+			this.SynclessRecordingMenuItem.Click += new System.EventHandler(this.SynclessRecordingMenuItem_Click);
+			// 
+			// ScreenshotSubMenu
+			// 
+			this.ScreenshotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ScreenshotMenuItem,
             this.ScreenshotAsMenuItem,
             this.ScreenshotClipboardMenuItem,
             this.ScreenshotClientClipboardMenuItem,
             this.toolStripSeparator20,
             this.ScreenshotCaptureOSDMenuItem1});
-            this.ScreenshotSubMenu.Name = "ScreenshotSubMenu";
-            this.ScreenshotSubMenu.Size = new System.Drawing.Size(152, 22);
-            this.ScreenshotSubMenu.Text = "Screenshot";
-            this.ScreenshotSubMenu.DropDownOpening += new System.EventHandler(this.ScreenshotSubMenu_DropDownOpening);
-            // 
-            // ScreenshotMenuItem
-            // 
-            this.ScreenshotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera;
-            this.ScreenshotMenuItem.Name = "ScreenshotMenuItem";
-            this.ScreenshotMenuItem.Size = new System.Drawing.Size(317, 22);
-            this.ScreenshotMenuItem.Text = "Screenshot";
-            this.ScreenshotMenuItem.Click += new System.EventHandler(this.ScreenshotMenuItem_Click);
-            // 
-            // ScreenshotAsMenuItem
-            // 
-            this.ScreenshotAsMenuItem.Name = "ScreenshotAsMenuItem";
-            this.ScreenshotAsMenuItem.Size = new System.Drawing.Size(317, 22);
-            this.ScreenshotAsMenuItem.Text = "Screenshot As...";
-            this.ScreenshotAsMenuItem.Click += new System.EventHandler(this.ScreenshotAsMenuItem_Click);
-            // 
-            // ScreenshotClipboardMenuItem
-            // 
-            this.ScreenshotClipboardMenuItem.Name = "ScreenshotClipboardMenuItem";
-            this.ScreenshotClipboardMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
-            this.ScreenshotClipboardMenuItem.Size = new System.Drawing.Size(317, 22);
-            this.ScreenshotClipboardMenuItem.Text = "Screenshot (raw) -> Clipboard";
-            this.ScreenshotClipboardMenuItem.Click += new System.EventHandler(this.ScreenshotClipboardMenuItem_Click);
-            // 
-            // ScreenshotClientClipboardMenuItem
-            // 
-            this.ScreenshotClientClipboardMenuItem.Name = "ScreenshotClientClipboardMenuItem";
-            this.ScreenshotClientClipboardMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
+			this.ScreenshotSubMenu.Name = "ScreenshotSubMenu";
+			this.ScreenshotSubMenu.Size = new System.Drawing.Size(134, 22);
+			this.ScreenshotSubMenu.Text = "Screenshot";
+			this.ScreenshotSubMenu.DropDownOpening += new System.EventHandler(this.ScreenshotSubMenu_DropDownOpening);
+			// 
+			// ScreenshotMenuItem
+			// 
+			this.ScreenshotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera;
+			this.ScreenshotMenuItem.Name = "ScreenshotMenuItem";
+			this.ScreenshotMenuItem.Size = new System.Drawing.Size(296, 22);
+			this.ScreenshotMenuItem.Text = "Screenshot";
+			this.ScreenshotMenuItem.Click += new System.EventHandler(this.ScreenshotMenuItem_Click);
+			// 
+			// ScreenshotAsMenuItem
+			// 
+			this.ScreenshotAsMenuItem.Name = "ScreenshotAsMenuItem";
+			this.ScreenshotAsMenuItem.Size = new System.Drawing.Size(296, 22);
+			this.ScreenshotAsMenuItem.Text = "Screenshot As...";
+			this.ScreenshotAsMenuItem.Click += new System.EventHandler(this.ScreenshotAsMenuItem_Click);
+			// 
+			// ScreenshotClipboardMenuItem
+			// 
+			this.ScreenshotClipboardMenuItem.Name = "ScreenshotClipboardMenuItem";
+			this.ScreenshotClipboardMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
+			this.ScreenshotClipboardMenuItem.Size = new System.Drawing.Size(296, 22);
+			this.ScreenshotClipboardMenuItem.Text = "Screenshot (raw) -> Clipboard";
+			this.ScreenshotClipboardMenuItem.Click += new System.EventHandler(this.ScreenshotClipboardMenuItem_Click);
+			// 
+			// ScreenshotClientClipboardMenuItem
+			// 
+			this.ScreenshotClientClipboardMenuItem.Name = "ScreenshotClientClipboardMenuItem";
+			this.ScreenshotClientClipboardMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
             | System.Windows.Forms.Keys.C)));
-            this.ScreenshotClientClipboardMenuItem.Size = new System.Drawing.Size(317, 22);
-            this.ScreenshotClientClipboardMenuItem.Text = "Screenshot (client) -> Clipboard";
-            this.ScreenshotClientClipboardMenuItem.Click += new System.EventHandler(this.ScreenshotClientClipboardMenuItem_Click);
-            // 
-            // toolStripSeparator20
-            // 
-            this.toolStripSeparator20.Name = "toolStripSeparator20";
-            this.toolStripSeparator20.Size = new System.Drawing.Size(314, 6);
-            // 
-            // ScreenshotCaptureOSDMenuItem1
-            // 
-            this.ScreenshotCaptureOSDMenuItem1.Name = "ScreenshotCaptureOSDMenuItem1";
-            this.ScreenshotCaptureOSDMenuItem1.Size = new System.Drawing.Size(317, 22);
-            this.ScreenshotCaptureOSDMenuItem1.Text = "Capture OSD";
-            this.ScreenshotCaptureOSDMenuItem1.Click += new System.EventHandler(this.ScreenshotCaptureOSDMenuItem_Click);
-            // 
-            // toolStripSeparator4
-            // 
-            this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6);
-            // 
-            // ExitMenuItem
-            // 
-            this.ExitMenuItem.Name = "ExitMenuItem";
-            this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
-            this.ExitMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.ExitMenuItem.Text = "Exit";
-            this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click);
-            // 
-            // EmulationSubMenu
-            // 
-            this.EmulationSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.ScreenshotClientClipboardMenuItem.Size = new System.Drawing.Size(296, 22);
+			this.ScreenshotClientClipboardMenuItem.Text = "Screenshot (client) -> Clipboard";
+			this.ScreenshotClientClipboardMenuItem.Click += new System.EventHandler(this.ScreenshotClientClipboardMenuItem_Click);
+			// 
+			// toolStripSeparator20
+			// 
+			this.toolStripSeparator20.Name = "toolStripSeparator20";
+			this.toolStripSeparator20.Size = new System.Drawing.Size(293, 6);
+			// 
+			// ScreenshotCaptureOSDMenuItem1
+			// 
+			this.ScreenshotCaptureOSDMenuItem1.Name = "ScreenshotCaptureOSDMenuItem1";
+			this.ScreenshotCaptureOSDMenuItem1.Size = new System.Drawing.Size(296, 22);
+			this.ScreenshotCaptureOSDMenuItem1.Text = "Capture OSD";
+			this.ScreenshotCaptureOSDMenuItem1.Click += new System.EventHandler(this.ScreenshotCaptureOSDMenuItem_Click);
+			// 
+			// toolStripSeparator4
+			// 
+			this.toolStripSeparator4.Name = "toolStripSeparator4";
+			this.toolStripSeparator4.Size = new System.Drawing.Size(131, 6);
+			// 
+			// ExitMenuItem
+			// 
+			this.ExitMenuItem.Name = "ExitMenuItem";
+			this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
+			this.ExitMenuItem.Size = new System.Drawing.Size(134, 22);
+			this.ExitMenuItem.Text = "Exit";
+			this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click);
+			// 
+			// EmulationSubMenu
+			// 
+			this.EmulationSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.PauseMenuItem,
             this.RebootCoreMenuItem,
             this.toolStripSeparator1,
             this.SoftResetMenuItem,
             this.HardResetMenuItem});
-            this.EmulationSubMenu.Name = "EmulationSubMenu";
-            this.EmulationSubMenu.Size = new System.Drawing.Size(73, 19);
-            this.EmulationSubMenu.Text = "&Emulation";
-            this.EmulationSubMenu.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened);
-            // 
-            // PauseMenuItem
-            // 
-            this.PauseMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause;
-            this.PauseMenuItem.Name = "PauseMenuItem";
-            this.PauseMenuItem.Size = new System.Drawing.Size(140, 22);
-            this.PauseMenuItem.Text = "&Pause";
-            this.PauseMenuItem.Click += new System.EventHandler(this.PauseMenuItem_Click);
-            // 
-            // RebootCoreMenuItem
-            // 
-            this.RebootCoreMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot;
-            this.RebootCoreMenuItem.Name = "RebootCoreMenuItem";
-            this.RebootCoreMenuItem.Size = new System.Drawing.Size(140, 22);
-            this.RebootCoreMenuItem.Text = "&Reboot Core";
-            this.RebootCoreMenuItem.Click += new System.EventHandler(this.PowerMenuItem_Click);
-            // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(137, 6);
-            // 
-            // SoftResetMenuItem
-            // 
-            this.SoftResetMenuItem.Name = "SoftResetMenuItem";
-            this.SoftResetMenuItem.Size = new System.Drawing.Size(140, 22);
-            this.SoftResetMenuItem.Text = "&Soft Reset";
-            this.SoftResetMenuItem.Click += new System.EventHandler(this.SoftResetMenuItem_Click);
-            // 
-            // HardResetMenuItem
-            // 
-            this.HardResetMenuItem.Name = "HardResetMenuItem";
-            this.HardResetMenuItem.Size = new System.Drawing.Size(140, 22);
-            this.HardResetMenuItem.Text = "&Hard Reset";
-            this.HardResetMenuItem.Click += new System.EventHandler(this.HardResetMenuItem_Click);
-            // 
-            // ViewSubMenu
-            // 
-            this.ViewSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.EmulationSubMenu.Name = "EmulationSubMenu";
+			this.EmulationSubMenu.Size = new System.Drawing.Size(65, 17);
+			this.EmulationSubMenu.Text = "&Emulation";
+			this.EmulationSubMenu.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened);
+			// 
+			// PauseMenuItem
+			// 
+			this.PauseMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause;
+			this.PauseMenuItem.Name = "PauseMenuItem";
+			this.PauseMenuItem.Size = new System.Drawing.Size(135, 22);
+			this.PauseMenuItem.Text = "&Pause";
+			this.PauseMenuItem.Click += new System.EventHandler(this.PauseMenuItem_Click);
+			// 
+			// RebootCoreMenuItem
+			// 
+			this.RebootCoreMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot;
+			this.RebootCoreMenuItem.Name = "RebootCoreMenuItem";
+			this.RebootCoreMenuItem.Size = new System.Drawing.Size(135, 22);
+			this.RebootCoreMenuItem.Text = "&Reboot Core";
+			this.RebootCoreMenuItem.Click += new System.EventHandler(this.PowerMenuItem_Click);
+			// 
+			// toolStripSeparator1
+			// 
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.Size = new System.Drawing.Size(132, 6);
+			// 
+			// SoftResetMenuItem
+			// 
+			this.SoftResetMenuItem.Name = "SoftResetMenuItem";
+			this.SoftResetMenuItem.Size = new System.Drawing.Size(135, 22);
+			this.SoftResetMenuItem.Text = "&Soft Reset";
+			this.SoftResetMenuItem.Click += new System.EventHandler(this.SoftResetMenuItem_Click);
+			// 
+			// HardResetMenuItem
+			// 
+			this.HardResetMenuItem.Name = "HardResetMenuItem";
+			this.HardResetMenuItem.Size = new System.Drawing.Size(135, 22);
+			this.HardResetMenuItem.Text = "&Hard Reset";
+			this.HardResetMenuItem.Click += new System.EventHandler(this.HardResetMenuItem_Click);
+			// 
+			// ViewSubMenu
+			// 
+			this.ViewSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.WindowSizeSubMenu,
             this.SwitchToFullscreenMenuItem,
             this.toolStripSeparator2,
@@ -1221,151 +1222,151 @@
             this.DisplayStatusBarMenuItem,
             this.DisplayMessagesMenuItem,
             this.DisplayLogWindowMenuItem});
-            this.ViewSubMenu.Name = "ViewSubMenu";
-            this.ViewSubMenu.Size = new System.Drawing.Size(44, 19);
-            this.ViewSubMenu.Text = "&View";
-            this.ViewSubMenu.DropDownOpened += new System.EventHandler(this.ViewSubMenu_DropDownOpened);
-            // 
-            // WindowSizeSubMenu
-            // 
-            this.WindowSizeSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.ViewSubMenu.Name = "ViewSubMenu";
+			this.ViewSubMenu.Size = new System.Drawing.Size(41, 17);
+			this.ViewSubMenu.Text = "&View";
+			this.ViewSubMenu.DropDownOpened += new System.EventHandler(this.ViewSubMenu_DropDownOpened);
+			// 
+			// WindowSizeSubMenu
+			// 
+			this.WindowSizeSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.x1MenuItem,
             this.x2MenuItem,
             this.x3MenuItem,
             this.x4MenuItem,
             this.x5MenuItem,
             this.mzMenuItem});
-            this.WindowSizeSubMenu.Name = "WindowSizeSubMenu";
-            this.WindowSizeSubMenu.Size = new System.Drawing.Size(198, 22);
-            this.WindowSizeSubMenu.Text = "&Window Size";
-            this.WindowSizeSubMenu.DropDownOpened += new System.EventHandler(this.WindowSizeSubMenu_DropDownOpened);
-            // 
-            // x1MenuItem
-            // 
-            this.x1MenuItem.Name = "x1MenuItem";
-            this.x1MenuItem.Size = new System.Drawing.Size(96, 22);
-            this.x1MenuItem.Text = "&1x";
-            this.x1MenuItem.Click += new System.EventHandler(this.WindowSize_Click);
-            // 
-            // x2MenuItem
-            // 
-            this.x2MenuItem.Name = "x2MenuItem";
-            this.x2MenuItem.Size = new System.Drawing.Size(96, 22);
-            this.x2MenuItem.Text = "&2x";
-            this.x2MenuItem.Click += new System.EventHandler(this.WindowSize_Click);
-            // 
-            // x3MenuItem
-            // 
-            this.x3MenuItem.Name = "x3MenuItem";
-            this.x3MenuItem.Size = new System.Drawing.Size(96, 22);
-            this.x3MenuItem.Text = "&3x";
-            this.x3MenuItem.Click += new System.EventHandler(this.WindowSize_Click);
-            // 
-            // x4MenuItem
-            // 
-            this.x4MenuItem.Name = "x4MenuItem";
-            this.x4MenuItem.Size = new System.Drawing.Size(96, 22);
-            this.x4MenuItem.Text = "&4x";
-            this.x4MenuItem.Click += new System.EventHandler(this.WindowSize_Click);
-            // 
-            // x5MenuItem
-            // 
-            this.x5MenuItem.Name = "x5MenuItem";
-            this.x5MenuItem.Size = new System.Drawing.Size(96, 22);
-            this.x5MenuItem.Text = "&5x";
-            this.x5MenuItem.Click += new System.EventHandler(this.WindowSize_Click);
-            // 
-            // mzMenuItem
-            // 
-            this.mzMenuItem.Name = "mzMenuItem";
-            this.mzMenuItem.Size = new System.Drawing.Size(96, 22);
-            this.mzMenuItem.Text = "&Max";
-            this.mzMenuItem.Click += new System.EventHandler(this.WindowSize_Click);
-            // 
-            // SwitchToFullscreenMenuItem
-            // 
-            this.SwitchToFullscreenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Fullscreen;
-            this.SwitchToFullscreenMenuItem.Name = "SwitchToFullscreenMenuItem";
-            this.SwitchToFullscreenMenuItem.Size = new System.Drawing.Size(198, 22);
-            this.SwitchToFullscreenMenuItem.Text = "Switch to Fullscreen";
-            this.SwitchToFullscreenMenuItem.Click += new System.EventHandler(this.SwitchToFullscreenMenuItem_Click);
-            // 
-            // toolStripSeparator2
-            // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(195, 6);
-            // 
-            // DisplayFPSMenuItem
-            // 
-            this.DisplayFPSMenuItem.Name = "DisplayFPSMenuItem";
-            this.DisplayFPSMenuItem.Size = new System.Drawing.Size(198, 22);
-            this.DisplayFPSMenuItem.Text = "Display FPS";
-            this.DisplayFPSMenuItem.Click += new System.EventHandler(this.DisplayFPSMenuItem_Click);
-            // 
-            // DisplayFrameCounterMenuItem
-            // 
-            this.DisplayFrameCounterMenuItem.Name = "DisplayFrameCounterMenuItem";
-            this.DisplayFrameCounterMenuItem.Size = new System.Drawing.Size(198, 22);
-            this.DisplayFrameCounterMenuItem.Text = "Display FrameCounter";
-            this.DisplayFrameCounterMenuItem.Click += new System.EventHandler(this.DisplayFrameCounterMenuItem_Click);
-            // 
-            // DisplayLagCounterMenuItem
-            // 
-            this.DisplayLagCounterMenuItem.Name = "DisplayLagCounterMenuItem";
-            this.DisplayLagCounterMenuItem.Size = new System.Drawing.Size(198, 22);
-            this.DisplayLagCounterMenuItem.Text = "Display Lag Counter";
-            this.DisplayLagCounterMenuItem.Click += new System.EventHandler(this.DisplayLagCounterMenuItem_Click);
-            // 
-            // DisplayInputMenuItem
-            // 
-            this.DisplayInputMenuItem.Name = "DisplayInputMenuItem";
-            this.DisplayInputMenuItem.Size = new System.Drawing.Size(198, 22);
-            this.DisplayInputMenuItem.Text = "Display Input";
-            this.DisplayInputMenuItem.Click += new System.EventHandler(this.DisplayInputMenuItem_Click);
-            // 
-            // DisplayRerecordCountMenuItem
-            // 
-            this.DisplayRerecordCountMenuItem.Name = "DisplayRerecordCountMenuItem";
-            this.DisplayRerecordCountMenuItem.Size = new System.Drawing.Size(198, 22);
-            this.DisplayRerecordCountMenuItem.Text = "Display Rerecord Count";
-            this.DisplayRerecordCountMenuItem.Click += new System.EventHandler(this.DisplayRerecordsMenuItem_Click);
-            // 
-            // DisplaySubtitlesMenuItem
-            // 
-            this.DisplaySubtitlesMenuItem.Name = "DisplaySubtitlesMenuItem";
-            this.DisplaySubtitlesMenuItem.Size = new System.Drawing.Size(198, 22);
-            this.DisplaySubtitlesMenuItem.Text = "Display Subtitles";
-            this.DisplaySubtitlesMenuItem.Click += new System.EventHandler(this.DisplaySubtitlesMenuItem_Click);
-            // 
-            // toolStripMenuItem4
-            // 
-            this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-            this.toolStripMenuItem4.Size = new System.Drawing.Size(195, 6);
-            // 
-            // DisplayStatusBarMenuItem
-            // 
-            this.DisplayStatusBarMenuItem.Name = "DisplayStatusBarMenuItem";
-            this.DisplayStatusBarMenuItem.Size = new System.Drawing.Size(198, 22);
-            this.DisplayStatusBarMenuItem.Text = "Display Status Bar";
-            this.DisplayStatusBarMenuItem.Click += new System.EventHandler(this.DisplayStatusBarMenuItem_Click);
-            // 
-            // DisplayMessagesMenuItem
-            // 
-            this.DisplayMessagesMenuItem.Name = "DisplayMessagesMenuItem";
-            this.DisplayMessagesMenuItem.Size = new System.Drawing.Size(198, 22);
-            this.DisplayMessagesMenuItem.Text = "Display Messages";
-            this.DisplayMessagesMenuItem.Click += new System.EventHandler(this.DisplayMessagesMenuItem_Click);
-            // 
-            // DisplayLogWindowMenuItem
-            // 
-            this.DisplayLogWindowMenuItem.Name = "DisplayLogWindowMenuItem";
-            this.DisplayLogWindowMenuItem.Size = new System.Drawing.Size(198, 22);
-            this.DisplayLogWindowMenuItem.Text = "Display Log Window";
-            this.DisplayLogWindowMenuItem.Click += new System.EventHandler(this.DisplayLogWindowMenuItem_Click);
-            // 
-            // ConfigSubMenu
-            // 
-            this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.WindowSizeSubMenu.Name = "WindowSizeSubMenu";
+			this.WindowSizeSubMenu.Size = new System.Drawing.Size(187, 22);
+			this.WindowSizeSubMenu.Text = "&Window Size";
+			this.WindowSizeSubMenu.DropDownOpened += new System.EventHandler(this.WindowSizeSubMenu_DropDownOpened);
+			// 
+			// x1MenuItem
+			// 
+			this.x1MenuItem.Name = "x1MenuItem";
+			this.x1MenuItem.Size = new System.Drawing.Size(94, 22);
+			this.x1MenuItem.Text = "&1x";
+			this.x1MenuItem.Click += new System.EventHandler(this.WindowSize_Click);
+			// 
+			// x2MenuItem
+			// 
+			this.x2MenuItem.Name = "x2MenuItem";
+			this.x2MenuItem.Size = new System.Drawing.Size(94, 22);
+			this.x2MenuItem.Text = "&2x";
+			this.x2MenuItem.Click += new System.EventHandler(this.WindowSize_Click);
+			// 
+			// x3MenuItem
+			// 
+			this.x3MenuItem.Name = "x3MenuItem";
+			this.x3MenuItem.Size = new System.Drawing.Size(94, 22);
+			this.x3MenuItem.Text = "&3x";
+			this.x3MenuItem.Click += new System.EventHandler(this.WindowSize_Click);
+			// 
+			// x4MenuItem
+			// 
+			this.x4MenuItem.Name = "x4MenuItem";
+			this.x4MenuItem.Size = new System.Drawing.Size(94, 22);
+			this.x4MenuItem.Text = "&4x";
+			this.x4MenuItem.Click += new System.EventHandler(this.WindowSize_Click);
+			// 
+			// x5MenuItem
+			// 
+			this.x5MenuItem.Name = "x5MenuItem";
+			this.x5MenuItem.Size = new System.Drawing.Size(94, 22);
+			this.x5MenuItem.Text = "&5x";
+			this.x5MenuItem.Click += new System.EventHandler(this.WindowSize_Click);
+			// 
+			// mzMenuItem
+			// 
+			this.mzMenuItem.Name = "mzMenuItem";
+			this.mzMenuItem.Size = new System.Drawing.Size(94, 22);
+			this.mzMenuItem.Text = "&Max";
+			this.mzMenuItem.Click += new System.EventHandler(this.WindowSize_Click);
+			// 
+			// SwitchToFullscreenMenuItem
+			// 
+			this.SwitchToFullscreenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Fullscreen;
+			this.SwitchToFullscreenMenuItem.Name = "SwitchToFullscreenMenuItem";
+			this.SwitchToFullscreenMenuItem.Size = new System.Drawing.Size(187, 22);
+			this.SwitchToFullscreenMenuItem.Text = "Switch to Fullscreen";
+			this.SwitchToFullscreenMenuItem.Click += new System.EventHandler(this.SwitchToFullscreenMenuItem_Click);
+			// 
+			// toolStripSeparator2
+			// 
+			this.toolStripSeparator2.Name = "toolStripSeparator2";
+			this.toolStripSeparator2.Size = new System.Drawing.Size(184, 6);
+			// 
+			// DisplayFPSMenuItem
+			// 
+			this.DisplayFPSMenuItem.Name = "DisplayFPSMenuItem";
+			this.DisplayFPSMenuItem.Size = new System.Drawing.Size(187, 22);
+			this.DisplayFPSMenuItem.Text = "Display FPS";
+			this.DisplayFPSMenuItem.Click += new System.EventHandler(this.DisplayFPSMenuItem_Click);
+			// 
+			// DisplayFrameCounterMenuItem
+			// 
+			this.DisplayFrameCounterMenuItem.Name = "DisplayFrameCounterMenuItem";
+			this.DisplayFrameCounterMenuItem.Size = new System.Drawing.Size(187, 22);
+			this.DisplayFrameCounterMenuItem.Text = "Display FrameCounter";
+			this.DisplayFrameCounterMenuItem.Click += new System.EventHandler(this.DisplayFrameCounterMenuItem_Click);
+			// 
+			// DisplayLagCounterMenuItem
+			// 
+			this.DisplayLagCounterMenuItem.Name = "DisplayLagCounterMenuItem";
+			this.DisplayLagCounterMenuItem.Size = new System.Drawing.Size(187, 22);
+			this.DisplayLagCounterMenuItem.Text = "Display Lag Counter";
+			this.DisplayLagCounterMenuItem.Click += new System.EventHandler(this.DisplayLagCounterMenuItem_Click);
+			// 
+			// DisplayInputMenuItem
+			// 
+			this.DisplayInputMenuItem.Name = "DisplayInputMenuItem";
+			this.DisplayInputMenuItem.Size = new System.Drawing.Size(187, 22);
+			this.DisplayInputMenuItem.Text = "Display Input";
+			this.DisplayInputMenuItem.Click += new System.EventHandler(this.DisplayInputMenuItem_Click);
+			// 
+			// DisplayRerecordCountMenuItem
+			// 
+			this.DisplayRerecordCountMenuItem.Name = "DisplayRerecordCountMenuItem";
+			this.DisplayRerecordCountMenuItem.Size = new System.Drawing.Size(187, 22);
+			this.DisplayRerecordCountMenuItem.Text = "Display Rerecord Count";
+			this.DisplayRerecordCountMenuItem.Click += new System.EventHandler(this.DisplayRerecordsMenuItem_Click);
+			// 
+			// DisplaySubtitlesMenuItem
+			// 
+			this.DisplaySubtitlesMenuItem.Name = "DisplaySubtitlesMenuItem";
+			this.DisplaySubtitlesMenuItem.Size = new System.Drawing.Size(187, 22);
+			this.DisplaySubtitlesMenuItem.Text = "Display Subtitles";
+			this.DisplaySubtitlesMenuItem.Click += new System.EventHandler(this.DisplaySubtitlesMenuItem_Click);
+			// 
+			// toolStripMenuItem4
+			// 
+			this.toolStripMenuItem4.Name = "toolStripMenuItem4";
+			this.toolStripMenuItem4.Size = new System.Drawing.Size(184, 6);
+			// 
+			// DisplayStatusBarMenuItem
+			// 
+			this.DisplayStatusBarMenuItem.Name = "DisplayStatusBarMenuItem";
+			this.DisplayStatusBarMenuItem.Size = new System.Drawing.Size(187, 22);
+			this.DisplayStatusBarMenuItem.Text = "Display Status Bar";
+			this.DisplayStatusBarMenuItem.Click += new System.EventHandler(this.DisplayStatusBarMenuItem_Click);
+			// 
+			// DisplayMessagesMenuItem
+			// 
+			this.DisplayMessagesMenuItem.Name = "DisplayMessagesMenuItem";
+			this.DisplayMessagesMenuItem.Size = new System.Drawing.Size(187, 22);
+			this.DisplayMessagesMenuItem.Text = "Display Messages";
+			this.DisplayMessagesMenuItem.Click += new System.EventHandler(this.DisplayMessagesMenuItem_Click);
+			// 
+			// DisplayLogWindowMenuItem
+			// 
+			this.DisplayLogWindowMenuItem.Name = "DisplayLogWindowMenuItem";
+			this.DisplayLogWindowMenuItem.Size = new System.Drawing.Size(187, 22);
+			this.DisplayLogWindowMenuItem.Text = "Display Log Window";
+			this.DisplayLogWindowMenuItem.Click += new System.EventHandler(this.DisplayLogWindowMenuItem_Click);
+			// 
+			// ConfigSubMenu
+			// 
+			this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ControllersMenuItem,
             this.HotkeysMenuItem,
             this.DisplayConfigMenuItem,
@@ -1385,113 +1386,113 @@
             this.toolStripSeparator10,
             this.SaveConfigMenuItem,
             this.LoadConfigMenuItem});
-            this.ConfigSubMenu.Name = "ConfigSubMenu";
-            this.ConfigSubMenu.Size = new System.Drawing.Size(55, 19);
-            this.ConfigSubMenu.Text = "&Config";
-            this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened);
-            // 
-            // ControllersMenuItem
-            // 
-            this.ControllersMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
-            this.ControllersMenuItem.Name = "ControllersMenuItem";
-            this.ControllersMenuItem.Size = new System.Drawing.Size(169, 22);
-            this.ControllersMenuItem.Text = "&Controllers...";
-            this.ControllersMenuItem.Click += new System.EventHandler(this.ControllersMenuItem_Click);
-            // 
-            // HotkeysMenuItem
-            // 
-            this.HotkeysMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys;
-            this.HotkeysMenuItem.Name = "HotkeysMenuItem";
-            this.HotkeysMenuItem.Size = new System.Drawing.Size(169, 22);
-            this.HotkeysMenuItem.Text = "&Hotkeys...";
-            this.HotkeysMenuItem.Click += new System.EventHandler(this.HotkeysMenuItem_Click);
-            // 
-            // DisplayConfigMenuItem
-            // 
-            this.DisplayConfigMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("DisplayConfigMenuItem.Image")));
-            this.DisplayConfigMenuItem.Name = "DisplayConfigMenuItem";
-            this.DisplayConfigMenuItem.Size = new System.Drawing.Size(169, 22);
-            this.DisplayConfigMenuItem.Text = "Display...";
-            this.DisplayConfigMenuItem.Click += new System.EventHandler(this.DisplayConfigMenuItem_Click);
-            // 
-            // SoundMenuItem
-            // 
-            this.SoundMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS;
-            this.SoundMenuItem.Name = "SoundMenuItem";
-            this.SoundMenuItem.Size = new System.Drawing.Size(169, 22);
-            this.SoundMenuItem.Text = "&Sound...";
-            this.SoundMenuItem.Click += new System.EventHandler(this.SoundMenuItem_Click);
-            // 
-            // PathsMenuItem
-            // 
-            this.PathsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS;
-            this.PathsMenuItem.Name = "PathsMenuItem";
-            this.PathsMenuItem.Size = new System.Drawing.Size(169, 22);
-            this.PathsMenuItem.Text = "Paths...";
-            this.PathsMenuItem.Click += new System.EventHandler(this.PathsMenuItem_Click);
-            // 
-            // FirmwaresMenuItem
-            // 
-            this.FirmwaresMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("FirmwaresMenuItem.Image")));
-            this.FirmwaresMenuItem.Name = "FirmwaresMenuItem";
-            this.FirmwaresMenuItem.Size = new System.Drawing.Size(169, 22);
-            this.FirmwaresMenuItem.Text = "&Firmwares...";
-            this.FirmwaresMenuItem.Click += new System.EventHandler(this.FirmwaresMenuItem_Click);
-            // 
-            // MessagesMenuItem
-            // 
-            this.MessagesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig;
-            this.MessagesMenuItem.Name = "MessagesMenuItem";
-            this.MessagesMenuItem.Size = new System.Drawing.Size(169, 22);
-            this.MessagesMenuItem.Text = "&Messages...";
-            this.MessagesMenuItem.Click += new System.EventHandler(this.MessagesMenuItem_Click);
-            // 
-            // AutofireMenuItem
-            // 
-            this.AutofireMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning;
-            this.AutofireMenuItem.Name = "AutofireMenuItem";
-            this.AutofireMenuItem.Size = new System.Drawing.Size(169, 22);
-            this.AutofireMenuItem.Text = "&Autofire...";
-            this.AutofireMenuItem.Click += new System.EventHandler(this.AutofireMenuItem_Click);
-            // 
-            // RewindOptionsMenuItem
-            // 
-            this.RewindOptionsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous;
-            this.RewindOptionsMenuItem.Name = "RewindOptionsMenuItem";
-            this.RewindOptionsMenuItem.Size = new System.Drawing.Size(169, 22);
-            this.RewindOptionsMenuItem.Text = "&Rewind && States...";
-            this.RewindOptionsMenuItem.Click += new System.EventHandler(this.RewindOptionsMenuItem_Click);
-            // 
-            // extensionsToolStripMenuItem
-            // 
-            this.extensionsToolStripMenuItem.Name = "extensionsToolStripMenuItem";
-            this.extensionsToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
-            this.extensionsToolStripMenuItem.Text = "File Extensions...";
-            this.extensionsToolStripMenuItem.Click += new System.EventHandler(this.FileExtensionsMenuItem_Click);
-            // 
-            // ClientOptionsMenuItem
-            // 
-            this.ClientOptionsMenuItem.Name = "ClientOptionsMenuItem";
-            this.ClientOptionsMenuItem.Size = new System.Drawing.Size(169, 22);
-            this.ClientOptionsMenuItem.Text = "&Customize...";
-            this.ClientOptionsMenuItem.Click += new System.EventHandler(this.CustomizeMenuItem_Click);
-            // 
-            // ProfilesMenuItem
-            // 
-            this.ProfilesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.user_blue_small;
-            this.ProfilesMenuItem.Name = "ProfilesMenuItem";
-            this.ProfilesMenuItem.Size = new System.Drawing.Size(169, 22);
-            this.ProfilesMenuItem.Text = "&Profiles...";
-            this.ProfilesMenuItem.Click += new System.EventHandler(this.ProfilesMenuItem_Click);
-            // 
-            // toolStripSeparator9
-            // 
-            this.toolStripSeparator9.Name = "toolStripSeparator9";
-            this.toolStripSeparator9.Size = new System.Drawing.Size(166, 6);
-            // 
-            // SpeedSkipSubMenu
-            // 
-            this.SpeedSkipSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.ConfigSubMenu.Name = "ConfigSubMenu";
+			this.ConfigSubMenu.Size = new System.Drawing.Size(50, 17);
+			this.ConfigSubMenu.Text = "&Config";
+			this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened);
+			// 
+			// ControllersMenuItem
+			// 
+			this.ControllersMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
+			this.ControllersMenuItem.Name = "ControllersMenuItem";
+			this.ControllersMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.ControllersMenuItem.Text = "&Controllers...";
+			this.ControllersMenuItem.Click += new System.EventHandler(this.ControllersMenuItem_Click);
+			// 
+			// HotkeysMenuItem
+			// 
+			this.HotkeysMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys;
+			this.HotkeysMenuItem.Name = "HotkeysMenuItem";
+			this.HotkeysMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.HotkeysMenuItem.Text = "&Hotkeys...";
+			this.HotkeysMenuItem.Click += new System.EventHandler(this.HotkeysMenuItem_Click);
+			// 
+			// DisplayConfigMenuItem
+			// 
+			this.DisplayConfigMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("DisplayConfigMenuItem.Image")));
+			this.DisplayConfigMenuItem.Name = "DisplayConfigMenuItem";
+			this.DisplayConfigMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.DisplayConfigMenuItem.Text = "Display...";
+			this.DisplayConfigMenuItem.Click += new System.EventHandler(this.DisplayConfigMenuItem_Click);
+			// 
+			// SoundMenuItem
+			// 
+			this.SoundMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS;
+			this.SoundMenuItem.Name = "SoundMenuItem";
+			this.SoundMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.SoundMenuItem.Text = "&Sound...";
+			this.SoundMenuItem.Click += new System.EventHandler(this.SoundMenuItem_Click);
+			// 
+			// PathsMenuItem
+			// 
+			this.PathsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS;
+			this.PathsMenuItem.Name = "PathsMenuItem";
+			this.PathsMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.PathsMenuItem.Text = "Paths...";
+			this.PathsMenuItem.Click += new System.EventHandler(this.PathsMenuItem_Click);
+			// 
+			// FirmwaresMenuItem
+			// 
+			this.FirmwaresMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("FirmwaresMenuItem.Image")));
+			this.FirmwaresMenuItem.Name = "FirmwaresMenuItem";
+			this.FirmwaresMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.FirmwaresMenuItem.Text = "&Firmwares...";
+			this.FirmwaresMenuItem.Click += new System.EventHandler(this.FirmwaresMenuItem_Click);
+			// 
+			// MessagesMenuItem
+			// 
+			this.MessagesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig;
+			this.MessagesMenuItem.Name = "MessagesMenuItem";
+			this.MessagesMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.MessagesMenuItem.Text = "&Messages...";
+			this.MessagesMenuItem.Click += new System.EventHandler(this.MessagesMenuItem_Click);
+			// 
+			// AutofireMenuItem
+			// 
+			this.AutofireMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning;
+			this.AutofireMenuItem.Name = "AutofireMenuItem";
+			this.AutofireMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.AutofireMenuItem.Text = "&Autofire...";
+			this.AutofireMenuItem.Click += new System.EventHandler(this.AutofireMenuItem_Click);
+			// 
+			// RewindOptionsMenuItem
+			// 
+			this.RewindOptionsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous;
+			this.RewindOptionsMenuItem.Name = "RewindOptionsMenuItem";
+			this.RewindOptionsMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.RewindOptionsMenuItem.Text = "&Rewind && States...";
+			this.RewindOptionsMenuItem.Click += new System.EventHandler(this.RewindOptionsMenuItem_Click);
+			// 
+			// extensionsToolStripMenuItem
+			// 
+			this.extensionsToolStripMenuItem.Name = "extensionsToolStripMenuItem";
+			this.extensionsToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.extensionsToolStripMenuItem.Text = "File Extensions...";
+			this.extensionsToolStripMenuItem.Click += new System.EventHandler(this.FileExtensionsMenuItem_Click);
+			// 
+			// ClientOptionsMenuItem
+			// 
+			this.ClientOptionsMenuItem.Name = "ClientOptionsMenuItem";
+			this.ClientOptionsMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.ClientOptionsMenuItem.Text = "&Customize...";
+			this.ClientOptionsMenuItem.Click += new System.EventHandler(this.CustomizeMenuItem_Click);
+			// 
+			// ProfilesMenuItem
+			// 
+			this.ProfilesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.user_blue_small;
+			this.ProfilesMenuItem.Name = "ProfilesMenuItem";
+			this.ProfilesMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.ProfilesMenuItem.Text = "&Profiles...";
+			this.ProfilesMenuItem.Click += new System.EventHandler(this.ProfilesMenuItem_Click);
+			// 
+			// toolStripSeparator9
+			// 
+			this.toolStripSeparator9.Name = "toolStripSeparator9";
+			this.toolStripSeparator9.Size = new System.Drawing.Size(162, 6);
+			// 
+			// SpeedSkipSubMenu
+			// 
+			this.SpeedSkipSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ClockThrottleMenuItem,
             this.AudioThrottleMenuItem,
             this.VsyncThrottleMenuItem,
@@ -1509,73 +1510,73 @@
             this.Speed150MenuItem,
             this.Speed200MenuItem,
             this.Speed400MenuItem});
-            this.SpeedSkipSubMenu.Name = "SpeedSkipSubMenu";
-            this.SpeedSkipSubMenu.Size = new System.Drawing.Size(169, 22);
-            this.SpeedSkipSubMenu.Text = "Speed/Skip";
-            this.SpeedSkipSubMenu.DropDownOpened += new System.EventHandler(this.FrameSkipMenuItem_DropDownOpened);
-            // 
-            // ClockThrottleMenuItem
-            // 
-            this.ClockThrottleMenuItem.Name = "ClockThrottleMenuItem";
-            this.ClockThrottleMenuItem.Size = new System.Drawing.Size(202, 22);
-            this.ClockThrottleMenuItem.Text = "Clock Throttle";
-            this.ClockThrottleMenuItem.Click += new System.EventHandler(this.ClockThrottleMenuItem_Click);
-            // 
-            // AudioThrottleMenuItem
-            // 
-            this.AudioThrottleMenuItem.Name = "AudioThrottleMenuItem";
-            this.AudioThrottleMenuItem.Size = new System.Drawing.Size(202, 22);
-            this.AudioThrottleMenuItem.Text = "Audio Throttle";
-            this.AudioThrottleMenuItem.Click += new System.EventHandler(this.AudioThrottleMenuItem_Click);
-            // 
-            // VsyncThrottleMenuItem
-            // 
-            this.VsyncThrottleMenuItem.Name = "VsyncThrottleMenuItem";
-            this.VsyncThrottleMenuItem.Size = new System.Drawing.Size(202, 22);
-            this.VsyncThrottleMenuItem.Text = "VSync Throttle";
-            this.VsyncThrottleMenuItem.Click += new System.EventHandler(this.VsyncThrottleMenuItem_Click);
-            // 
-            // toolStripSeparator27
-            // 
-            this.toolStripSeparator27.Name = "toolStripSeparator27";
-            this.toolStripSeparator27.Size = new System.Drawing.Size(199, 6);
-            // 
-            // VsyncEnabledMenuItem
-            // 
-            this.VsyncEnabledMenuItem.Name = "VsyncEnabledMenuItem";
-            this.VsyncEnabledMenuItem.Size = new System.Drawing.Size(202, 22);
-            this.VsyncEnabledMenuItem.Text = "VSync Enabled";
-            this.VsyncEnabledMenuItem.Click += new System.EventHandler(this.VsyncEnabledMenuItem_Click);
-            // 
-            // toolStripMenuItem3
-            // 
-            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(199, 6);
-            // 
-            // miUnthrottled
-            // 
-            this.miUnthrottled.Name = "miUnthrottled";
-            this.miUnthrottled.Size = new System.Drawing.Size(202, 22);
-            this.miUnthrottled.Text = "Unthrottled";
-            this.miUnthrottled.Click += new System.EventHandler(this.miUnthrottled_Click);
-            // 
-            // MinimizeSkippingMenuItem
-            // 
-            this.MinimizeSkippingMenuItem.Name = "MinimizeSkippingMenuItem";
-            this.MinimizeSkippingMenuItem.Size = new System.Drawing.Size(202, 22);
-            this.MinimizeSkippingMenuItem.Text = "Auto-minimize skipping";
-            this.MinimizeSkippingMenuItem.Click += new System.EventHandler(this.MinimizeSkippingMenuItem_Click);
-            // 
-            // NeverSkipMenuItem
-            // 
-            this.NeverSkipMenuItem.Name = "NeverSkipMenuItem";
-            this.NeverSkipMenuItem.Size = new System.Drawing.Size(202, 22);
-            this.NeverSkipMenuItem.Text = "Skip 0 (never)";
-            this.NeverSkipMenuItem.Click += new System.EventHandler(this.NeverSkipMenuItem_Click);
-            // 
-            // toolStripMenuItem17
-            // 
-            this.toolStripMenuItem17.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.SpeedSkipSubMenu.Name = "SpeedSkipSubMenu";
+			this.SpeedSkipSubMenu.Size = new System.Drawing.Size(165, 22);
+			this.SpeedSkipSubMenu.Text = "Speed/Skip";
+			this.SpeedSkipSubMenu.DropDownOpened += new System.EventHandler(this.FrameSkipMenuItem_DropDownOpened);
+			// 
+			// ClockThrottleMenuItem
+			// 
+			this.ClockThrottleMenuItem.Name = "ClockThrottleMenuItem";
+			this.ClockThrottleMenuItem.Size = new System.Drawing.Size(181, 22);
+			this.ClockThrottleMenuItem.Text = "Clock Throttle";
+			this.ClockThrottleMenuItem.Click += new System.EventHandler(this.ClockThrottleMenuItem_Click);
+			// 
+			// AudioThrottleMenuItem
+			// 
+			this.AudioThrottleMenuItem.Name = "AudioThrottleMenuItem";
+			this.AudioThrottleMenuItem.Size = new System.Drawing.Size(181, 22);
+			this.AudioThrottleMenuItem.Text = "Audio Throttle";
+			this.AudioThrottleMenuItem.Click += new System.EventHandler(this.AudioThrottleMenuItem_Click);
+			// 
+			// VsyncThrottleMenuItem
+			// 
+			this.VsyncThrottleMenuItem.Name = "VsyncThrottleMenuItem";
+			this.VsyncThrottleMenuItem.Size = new System.Drawing.Size(181, 22);
+			this.VsyncThrottleMenuItem.Text = "VSync Throttle";
+			this.VsyncThrottleMenuItem.Click += new System.EventHandler(this.VsyncThrottleMenuItem_Click);
+			// 
+			// toolStripSeparator27
+			// 
+			this.toolStripSeparator27.Name = "toolStripSeparator27";
+			this.toolStripSeparator27.Size = new System.Drawing.Size(178, 6);
+			// 
+			// VsyncEnabledMenuItem
+			// 
+			this.VsyncEnabledMenuItem.Name = "VsyncEnabledMenuItem";
+			this.VsyncEnabledMenuItem.Size = new System.Drawing.Size(181, 22);
+			this.VsyncEnabledMenuItem.Text = "VSync Enabled";
+			this.VsyncEnabledMenuItem.Click += new System.EventHandler(this.VsyncEnabledMenuItem_Click);
+			// 
+			// toolStripMenuItem3
+			// 
+			this.toolStripMenuItem3.Name = "toolStripMenuItem3";
+			this.toolStripMenuItem3.Size = new System.Drawing.Size(178, 6);
+			// 
+			// miUnthrottled
+			// 
+			this.miUnthrottled.Name = "miUnthrottled";
+			this.miUnthrottled.Size = new System.Drawing.Size(181, 22);
+			this.miUnthrottled.Text = "Unthrottled";
+			this.miUnthrottled.Click += new System.EventHandler(this.miUnthrottled_Click);
+			// 
+			// MinimizeSkippingMenuItem
+			// 
+			this.MinimizeSkippingMenuItem.Name = "MinimizeSkippingMenuItem";
+			this.MinimizeSkippingMenuItem.Size = new System.Drawing.Size(181, 22);
+			this.MinimizeSkippingMenuItem.Text = "Auto-minimize skipping";
+			this.MinimizeSkippingMenuItem.Click += new System.EventHandler(this.MinimizeSkippingMenuItem_Click);
+			// 
+			// NeverSkipMenuItem
+			// 
+			this.NeverSkipMenuItem.Name = "NeverSkipMenuItem";
+			this.NeverSkipMenuItem.Size = new System.Drawing.Size(181, 22);
+			this.NeverSkipMenuItem.Text = "Skip 0 (never)";
+			this.NeverSkipMenuItem.Click += new System.EventHandler(this.NeverSkipMenuItem_Click);
+			// 
+			// toolStripMenuItem17
+			// 
+			this.toolStripMenuItem17.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.Frameskip1MenuItem,
             this.Frameskip2MenuItem,
             this.Frameskip3MenuItem,
@@ -1585,231 +1586,231 @@
             this.Frameskip7MenuItem,
             this.Frameskip8MenuItem,
             this.Frameskip9MenuItem});
-            this.toolStripMenuItem17.Name = "toolStripMenuItem17";
-            this.toolStripMenuItem17.Size = new System.Drawing.Size(202, 22);
-            this.toolStripMenuItem17.Text = "Skip 1..9";
-            // 
-            // Frameskip1MenuItem
-            // 
-            this.Frameskip1MenuItem.Name = "Frameskip1MenuItem";
-            this.Frameskip1MenuItem.Size = new System.Drawing.Size(80, 22);
-            this.Frameskip1MenuItem.Text = "1";
-            this.Frameskip1MenuItem.Click += new System.EventHandler(this.Frameskip1MenuItem_Click);
-            // 
-            // Frameskip2MenuItem
-            // 
-            this.Frameskip2MenuItem.Name = "Frameskip2MenuItem";
-            this.Frameskip2MenuItem.Size = new System.Drawing.Size(80, 22);
-            this.Frameskip2MenuItem.Text = "2";
-            this.Frameskip2MenuItem.Click += new System.EventHandler(this.Frameskip2MenuItem_Click);
-            // 
-            // Frameskip3MenuItem
-            // 
-            this.Frameskip3MenuItem.Name = "Frameskip3MenuItem";
-            this.Frameskip3MenuItem.Size = new System.Drawing.Size(80, 22);
-            this.Frameskip3MenuItem.Text = "3";
-            this.Frameskip3MenuItem.Click += new System.EventHandler(this.Frameskip3MenuItem_Click);
-            // 
-            // Frameskip4MenuItem
-            // 
-            this.Frameskip4MenuItem.Name = "Frameskip4MenuItem";
-            this.Frameskip4MenuItem.Size = new System.Drawing.Size(80, 22);
-            this.Frameskip4MenuItem.Text = "4";
-            this.Frameskip4MenuItem.Click += new System.EventHandler(this.Frameskip4MenuItem_Click);
-            // 
-            // Frameskip5MenuItem
-            // 
-            this.Frameskip5MenuItem.Name = "Frameskip5MenuItem";
-            this.Frameskip5MenuItem.Size = new System.Drawing.Size(80, 22);
-            this.Frameskip5MenuItem.Text = "5";
-            this.Frameskip5MenuItem.Click += new System.EventHandler(this.Frameskip5MenuItem_Click);
-            // 
-            // Frameskip6MenuItem
-            // 
-            this.Frameskip6MenuItem.Name = "Frameskip6MenuItem";
-            this.Frameskip6MenuItem.Size = new System.Drawing.Size(80, 22);
-            this.Frameskip6MenuItem.Text = "6";
-            this.Frameskip6MenuItem.Click += new System.EventHandler(this.Frameskip6MenuItem_Click);
-            // 
-            // Frameskip7MenuItem
-            // 
-            this.Frameskip7MenuItem.Name = "Frameskip7MenuItem";
-            this.Frameskip7MenuItem.Size = new System.Drawing.Size(80, 22);
-            this.Frameskip7MenuItem.Text = "7";
-            this.Frameskip7MenuItem.Click += new System.EventHandler(this.Frameskip7MenuItem_Click);
-            // 
-            // Frameskip8MenuItem
-            // 
-            this.Frameskip8MenuItem.Name = "Frameskip8MenuItem";
-            this.Frameskip8MenuItem.Size = new System.Drawing.Size(80, 22);
-            this.Frameskip8MenuItem.Text = "8";
-            this.Frameskip8MenuItem.Click += new System.EventHandler(this.Frameskip8MenuItem_Click);
-            // 
-            // Frameskip9MenuItem
-            // 
-            this.Frameskip9MenuItem.Name = "Frameskip9MenuItem";
-            this.Frameskip9MenuItem.Size = new System.Drawing.Size(80, 22);
-            this.Frameskip9MenuItem.Text = "9";
-            this.Frameskip9MenuItem.Click += new System.EventHandler(this.Frameskip9MenuItem_Click);
-            // 
-            // toolStripMenuItem5
-            // 
-            this.toolStripMenuItem5.Name = "toolStripMenuItem5";
-            this.toolStripMenuItem5.Size = new System.Drawing.Size(199, 6);
-            // 
-            // Speed50MenuItem
-            // 
-            this.Speed50MenuItem.Name = "Speed50MenuItem";
-            this.Speed50MenuItem.Size = new System.Drawing.Size(202, 22);
-            this.Speed50MenuItem.Text = "Speed 50%";
-            this.Speed50MenuItem.Click += new System.EventHandler(this.Speed50MenuItem_Click);
-            // 
-            // Speed75MenuItem
-            // 
-            this.Speed75MenuItem.Name = "Speed75MenuItem";
-            this.Speed75MenuItem.Size = new System.Drawing.Size(202, 22);
-            this.Speed75MenuItem.Text = "Speed 75%";
-            this.Speed75MenuItem.Click += new System.EventHandler(this.Speed75MenuItem_Click);
-            // 
-            // Speed100MenuItem
-            // 
-            this.Speed100MenuItem.Name = "Speed100MenuItem";
-            this.Speed100MenuItem.Size = new System.Drawing.Size(202, 22);
-            this.Speed100MenuItem.Text = "Speed 100%";
-            this.Speed100MenuItem.Click += new System.EventHandler(this.Speed100MenuItem_Click);
-            // 
-            // Speed150MenuItem
-            // 
-            this.Speed150MenuItem.Name = "Speed150MenuItem";
-            this.Speed150MenuItem.Size = new System.Drawing.Size(202, 22);
-            this.Speed150MenuItem.Text = "Speed 150%";
-            this.Speed150MenuItem.Click += new System.EventHandler(this.Speed150MenuItem_Click);
-            // 
-            // Speed200MenuItem
-            // 
-            this.Speed200MenuItem.Name = "Speed200MenuItem";
-            this.Speed200MenuItem.Size = new System.Drawing.Size(202, 22);
-            this.Speed200MenuItem.Text = "Speed 200%";
-            this.Speed200MenuItem.Click += new System.EventHandler(this.Speed200MenuItem_Click);
-            // 
-            // Speed400MenuItem
-            // 
-            this.Speed400MenuItem.Name = "Speed400MenuItem";
-            this.Speed400MenuItem.Size = new System.Drawing.Size(202, 22);
-            this.Speed400MenuItem.Text = "Speed 400%";
-            this.Speed400MenuItem.Click += new System.EventHandler(this.Speed400MenuItem_Click);
-            // 
-            // KeyPrioritySubMenu
-            // 
-            this.KeyPrioritySubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.toolStripMenuItem17.Name = "toolStripMenuItem17";
+			this.toolStripMenuItem17.Size = new System.Drawing.Size(181, 22);
+			this.toolStripMenuItem17.Text = "Skip 1..9";
+			// 
+			// Frameskip1MenuItem
+			// 
+			this.Frameskip1MenuItem.Name = "Frameskip1MenuItem";
+			this.Frameskip1MenuItem.Size = new System.Drawing.Size(80, 22);
+			this.Frameskip1MenuItem.Text = "1";
+			this.Frameskip1MenuItem.Click += new System.EventHandler(this.Frameskip1MenuItem_Click);
+			// 
+			// Frameskip2MenuItem
+			// 
+			this.Frameskip2MenuItem.Name = "Frameskip2MenuItem";
+			this.Frameskip2MenuItem.Size = new System.Drawing.Size(80, 22);
+			this.Frameskip2MenuItem.Text = "2";
+			this.Frameskip2MenuItem.Click += new System.EventHandler(this.Frameskip2MenuItem_Click);
+			// 
+			// Frameskip3MenuItem
+			// 
+			this.Frameskip3MenuItem.Name = "Frameskip3MenuItem";
+			this.Frameskip3MenuItem.Size = new System.Drawing.Size(80, 22);
+			this.Frameskip3MenuItem.Text = "3";
+			this.Frameskip3MenuItem.Click += new System.EventHandler(this.Frameskip3MenuItem_Click);
+			// 
+			// Frameskip4MenuItem
+			// 
+			this.Frameskip4MenuItem.Name = "Frameskip4MenuItem";
+			this.Frameskip4MenuItem.Size = new System.Drawing.Size(80, 22);
+			this.Frameskip4MenuItem.Text = "4";
+			this.Frameskip4MenuItem.Click += new System.EventHandler(this.Frameskip4MenuItem_Click);
+			// 
+			// Frameskip5MenuItem
+			// 
+			this.Frameskip5MenuItem.Name = "Frameskip5MenuItem";
+			this.Frameskip5MenuItem.Size = new System.Drawing.Size(80, 22);
+			this.Frameskip5MenuItem.Text = "5";
+			this.Frameskip5MenuItem.Click += new System.EventHandler(this.Frameskip5MenuItem_Click);
+			// 
+			// Frameskip6MenuItem
+			// 
+			this.Frameskip6MenuItem.Name = "Frameskip6MenuItem";
+			this.Frameskip6MenuItem.Size = new System.Drawing.Size(80, 22);
+			this.Frameskip6MenuItem.Text = "6";
+			this.Frameskip6MenuItem.Click += new System.EventHandler(this.Frameskip6MenuItem_Click);
+			// 
+			// Frameskip7MenuItem
+			// 
+			this.Frameskip7MenuItem.Name = "Frameskip7MenuItem";
+			this.Frameskip7MenuItem.Size = new System.Drawing.Size(80, 22);
+			this.Frameskip7MenuItem.Text = "7";
+			this.Frameskip7MenuItem.Click += new System.EventHandler(this.Frameskip7MenuItem_Click);
+			// 
+			// Frameskip8MenuItem
+			// 
+			this.Frameskip8MenuItem.Name = "Frameskip8MenuItem";
+			this.Frameskip8MenuItem.Size = new System.Drawing.Size(80, 22);
+			this.Frameskip8MenuItem.Text = "8";
+			this.Frameskip8MenuItem.Click += new System.EventHandler(this.Frameskip8MenuItem_Click);
+			// 
+			// Frameskip9MenuItem
+			// 
+			this.Frameskip9MenuItem.Name = "Frameskip9MenuItem";
+			this.Frameskip9MenuItem.Size = new System.Drawing.Size(80, 22);
+			this.Frameskip9MenuItem.Text = "9";
+			this.Frameskip9MenuItem.Click += new System.EventHandler(this.Frameskip9MenuItem_Click);
+			// 
+			// toolStripMenuItem5
+			// 
+			this.toolStripMenuItem5.Name = "toolStripMenuItem5";
+			this.toolStripMenuItem5.Size = new System.Drawing.Size(178, 6);
+			// 
+			// Speed50MenuItem
+			// 
+			this.Speed50MenuItem.Name = "Speed50MenuItem";
+			this.Speed50MenuItem.Size = new System.Drawing.Size(181, 22);
+			this.Speed50MenuItem.Text = "Speed 50%";
+			this.Speed50MenuItem.Click += new System.EventHandler(this.Speed50MenuItem_Click);
+			// 
+			// Speed75MenuItem
+			// 
+			this.Speed75MenuItem.Name = "Speed75MenuItem";
+			this.Speed75MenuItem.Size = new System.Drawing.Size(181, 22);
+			this.Speed75MenuItem.Text = "Speed 75%";
+			this.Speed75MenuItem.Click += new System.EventHandler(this.Speed75MenuItem_Click);
+			// 
+			// Speed100MenuItem
+			// 
+			this.Speed100MenuItem.Name = "Speed100MenuItem";
+			this.Speed100MenuItem.Size = new System.Drawing.Size(181, 22);
+			this.Speed100MenuItem.Text = "Speed 100%";
+			this.Speed100MenuItem.Click += new System.EventHandler(this.Speed100MenuItem_Click);
+			// 
+			// Speed150MenuItem
+			// 
+			this.Speed150MenuItem.Name = "Speed150MenuItem";
+			this.Speed150MenuItem.Size = new System.Drawing.Size(181, 22);
+			this.Speed150MenuItem.Text = "Speed 150%";
+			this.Speed150MenuItem.Click += new System.EventHandler(this.Speed150MenuItem_Click);
+			// 
+			// Speed200MenuItem
+			// 
+			this.Speed200MenuItem.Name = "Speed200MenuItem";
+			this.Speed200MenuItem.Size = new System.Drawing.Size(181, 22);
+			this.Speed200MenuItem.Text = "Speed 200%";
+			this.Speed200MenuItem.Click += new System.EventHandler(this.Speed200MenuItem_Click);
+			// 
+			// Speed400MenuItem
+			// 
+			this.Speed400MenuItem.Name = "Speed400MenuItem";
+			this.Speed400MenuItem.Size = new System.Drawing.Size(181, 22);
+			this.Speed400MenuItem.Text = "Speed 400%";
+			this.Speed400MenuItem.Click += new System.EventHandler(this.Speed400MenuItem_Click);
+			// 
+			// KeyPrioritySubMenu
+			// 
+			this.KeyPrioritySubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.BothHkAndControllerMenuItem,
             this.InputOverHkMenuItem,
             this.HkOverInputMenuItem});
-            this.KeyPrioritySubMenu.Name = "KeyPrioritySubMenu";
-            this.KeyPrioritySubMenu.Size = new System.Drawing.Size(169, 22);
-            this.KeyPrioritySubMenu.Text = "Key Priority";
-            this.KeyPrioritySubMenu.DropDownOpened += new System.EventHandler(this.KeyPriorityMenuItem_DropDownOpened);
-            // 
-            // BothHkAndControllerMenuItem
-            // 
-            this.BothHkAndControllerMenuItem.Name = "BothHkAndControllerMenuItem";
-            this.BothHkAndControllerMenuItem.Size = new System.Drawing.Size(229, 22);
-            this.BothHkAndControllerMenuItem.Text = "Both Hotkeys and Controllers";
-            this.BothHkAndControllerMenuItem.Click += new System.EventHandler(this.BothHkAndControllerMenuItem_Click);
-            // 
-            // InputOverHkMenuItem
-            // 
-            this.InputOverHkMenuItem.Name = "InputOverHkMenuItem";
-            this.InputOverHkMenuItem.Size = new System.Drawing.Size(229, 22);
-            this.InputOverHkMenuItem.Text = "Input overrides Hotkeys";
-            this.InputOverHkMenuItem.Click += new System.EventHandler(this.InputOverHkMenuItem_Click);
-            // 
-            // HkOverInputMenuItem
-            // 
-            this.HkOverInputMenuItem.Name = "HkOverInputMenuItem";
-            this.HkOverInputMenuItem.Size = new System.Drawing.Size(229, 22);
-            this.HkOverInputMenuItem.Text = "Hotkeys override Input";
-            this.HkOverInputMenuItem.Click += new System.EventHandler(this.HkOverInputMenuItem_Click);
-            // 
-            // CoresSubMenu
-            // 
-            this.CoresSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.KeyPrioritySubMenu.Name = "KeyPrioritySubMenu";
+			this.KeyPrioritySubMenu.Size = new System.Drawing.Size(165, 22);
+			this.KeyPrioritySubMenu.Text = "Key Priority";
+			this.KeyPrioritySubMenu.DropDownOpened += new System.EventHandler(this.KeyPriorityMenuItem_DropDownOpened);
+			// 
+			// BothHkAndControllerMenuItem
+			// 
+			this.BothHkAndControllerMenuItem.Name = "BothHkAndControllerMenuItem";
+			this.BothHkAndControllerMenuItem.Size = new System.Drawing.Size(214, 22);
+			this.BothHkAndControllerMenuItem.Text = "Both Hotkeys and Controllers";
+			this.BothHkAndControllerMenuItem.Click += new System.EventHandler(this.BothHkAndControllerMenuItem_Click);
+			// 
+			// InputOverHkMenuItem
+			// 
+			this.InputOverHkMenuItem.Name = "InputOverHkMenuItem";
+			this.InputOverHkMenuItem.Size = new System.Drawing.Size(214, 22);
+			this.InputOverHkMenuItem.Text = "Input overrides Hotkeys";
+			this.InputOverHkMenuItem.Click += new System.EventHandler(this.InputOverHkMenuItem_Click);
+			// 
+			// HkOverInputMenuItem
+			// 
+			this.HkOverInputMenuItem.Name = "HkOverInputMenuItem";
+			this.HkOverInputMenuItem.Size = new System.Drawing.Size(214, 22);
+			this.HkOverInputMenuItem.Text = "Hotkeys override Input";
+			this.HkOverInputMenuItem.Click += new System.EventHandler(this.HkOverInputMenuItem_Click);
+			// 
+			// CoresSubMenu
+			// 
+			this.CoresSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.GBInSGBMenuItem,
             this.NesInQuickNESMenuItem,
             this.SnesWithSnes9xMenuItem,
             this.gBAWithMGBAToolStripMenuItem,
             this.toolStripSeparator8,
             this.N64VideoPluginSettingsMenuItem});
-            this.CoresSubMenu.Name = "CoresSubMenu";
-            this.CoresSubMenu.Size = new System.Drawing.Size(169, 22);
-            this.CoresSubMenu.Text = "Cores";
-            this.CoresSubMenu.DropDownOpened += new System.EventHandler(this.CoresSubMenu_DropDownOpened);
-            // 
-            // GBInSGBMenuItem
-            // 
-            this.GBInSGBMenuItem.Name = "GBInSGBMenuItem";
-            this.GBInSGBMenuItem.Size = new System.Drawing.Size(210, 22);
-            this.GBInSGBMenuItem.Text = "GB in SGB";
-            this.GBInSGBMenuItem.Click += new System.EventHandler(this.GBInSGBMenuItem_Click);
-            // 
-            // NesInQuickNESMenuItem
-            // 
-            this.NesInQuickNESMenuItem.Name = "NesInQuickNESMenuItem";
-            this.NesInQuickNESMenuItem.Size = new System.Drawing.Size(210, 22);
-            this.NesInQuickNESMenuItem.Text = "NES with QuickNES";
-            this.NesInQuickNESMenuItem.Click += new System.EventHandler(this.NesInQuickNESMenuItem_Click);
-            // 
-            // SnesWithSnes9xMenuItem
-            // 
-            this.SnesWithSnes9xMenuItem.Name = "SnesWithSnes9xMenuItem";
-            this.SnesWithSnes9xMenuItem.Size = new System.Drawing.Size(210, 22);
-            this.SnesWithSnes9xMenuItem.Text = "SNES with Snes9x";
-            this.SnesWithSnes9xMenuItem.Click += new System.EventHandler(this.SnesWithSnes9xMenuItem_Click);
-            // 
-            // gBAWithMGBAToolStripMenuItem
-            // 
-            this.gBAWithMGBAToolStripMenuItem.Name = "gBAWithMGBAToolStripMenuItem";
-            this.gBAWithMGBAToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
-            this.gBAWithMGBAToolStripMenuItem.Text = "GBA with mGBA";
-            this.gBAWithMGBAToolStripMenuItem.Click += new System.EventHandler(this.gBAWithMGBAToolStripMenuItem_Click);
-            // 
-            // toolStripSeparator8
-            // 
-            this.toolStripSeparator8.Name = "toolStripSeparator8";
-            this.toolStripSeparator8.Size = new System.Drawing.Size(207, 6);
-            // 
-            // N64VideoPluginSettingsMenuItem
-            // 
-            this.N64VideoPluginSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.monitor;
-            this.N64VideoPluginSettingsMenuItem.Name = "N64VideoPluginSettingsMenuItem";
-            this.N64VideoPluginSettingsMenuItem.Size = new System.Drawing.Size(210, 22);
-            this.N64VideoPluginSettingsMenuItem.Text = "N64 Video Plugin Settings";
-            this.N64VideoPluginSettingsMenuItem.Click += new System.EventHandler(this.N64VideoPluginSettingsMenuItem_Click);
-            // 
-            // toolStripSeparator10
-            // 
-            this.toolStripSeparator10.Name = "toolStripSeparator10";
-            this.toolStripSeparator10.Size = new System.Drawing.Size(166, 6);
-            // 
-            // SaveConfigMenuItem
-            // 
-            this.SaveConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save;
-            this.SaveConfigMenuItem.Name = "SaveConfigMenuItem";
-            this.SaveConfigMenuItem.Size = new System.Drawing.Size(169, 22);
-            this.SaveConfigMenuItem.Text = "Save Config";
-            this.SaveConfigMenuItem.Click += new System.EventHandler(this.SaveConfigMenuItem_Click);
-            // 
-            // LoadConfigMenuItem
-            // 
-            this.LoadConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig;
-            this.LoadConfigMenuItem.Name = "LoadConfigMenuItem";
-            this.LoadConfigMenuItem.Size = new System.Drawing.Size(169, 22);
-            this.LoadConfigMenuItem.Text = "Load Config";
-            this.LoadConfigMenuItem.Click += new System.EventHandler(this.LoadConfigMenuItem_Click);
-            // 
-            // ToolsSubMenu
-            // 
-            this.ToolsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.CoresSubMenu.Name = "CoresSubMenu";
+			this.CoresSubMenu.Size = new System.Drawing.Size(165, 22);
+			this.CoresSubMenu.Text = "Cores";
+			this.CoresSubMenu.DropDownOpened += new System.EventHandler(this.CoresSubMenu_DropDownOpened);
+			// 
+			// GBInSGBMenuItem
+			// 
+			this.GBInSGBMenuItem.Name = "GBInSGBMenuItem";
+			this.GBInSGBMenuItem.Size = new System.Drawing.Size(195, 22);
+			this.GBInSGBMenuItem.Text = "GB in SGB";
+			this.GBInSGBMenuItem.Click += new System.EventHandler(this.GBInSGBMenuItem_Click);
+			// 
+			// NesInQuickNESMenuItem
+			// 
+			this.NesInQuickNESMenuItem.Name = "NesInQuickNESMenuItem";
+			this.NesInQuickNESMenuItem.Size = new System.Drawing.Size(195, 22);
+			this.NesInQuickNESMenuItem.Text = "NES with QuickNES";
+			this.NesInQuickNESMenuItem.Click += new System.EventHandler(this.NesInQuickNESMenuItem_Click);
+			// 
+			// SnesWithSnes9xMenuItem
+			// 
+			this.SnesWithSnes9xMenuItem.Name = "SnesWithSnes9xMenuItem";
+			this.SnesWithSnes9xMenuItem.Size = new System.Drawing.Size(195, 22);
+			this.SnesWithSnes9xMenuItem.Text = "SNES with Snes9x";
+			this.SnesWithSnes9xMenuItem.Click += new System.EventHandler(this.SnesWithSnes9xMenuItem_Click);
+			// 
+			// gBAWithMGBAToolStripMenuItem
+			// 
+			this.gBAWithMGBAToolStripMenuItem.Name = "gBAWithMGBAToolStripMenuItem";
+			this.gBAWithMGBAToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
+			this.gBAWithMGBAToolStripMenuItem.Text = "GBA with mGBA";
+			this.gBAWithMGBAToolStripMenuItem.Click += new System.EventHandler(this.gBAWithMGBAToolStripMenuItem_Click);
+			// 
+			// toolStripSeparator8
+			// 
+			this.toolStripSeparator8.Name = "toolStripSeparator8";
+			this.toolStripSeparator8.Size = new System.Drawing.Size(192, 6);
+			// 
+			// N64VideoPluginSettingsMenuItem
+			// 
+			this.N64VideoPluginSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.monitor;
+			this.N64VideoPluginSettingsMenuItem.Name = "N64VideoPluginSettingsMenuItem";
+			this.N64VideoPluginSettingsMenuItem.Size = new System.Drawing.Size(195, 22);
+			this.N64VideoPluginSettingsMenuItem.Text = "N64 Video Plugin Settings";
+			this.N64VideoPluginSettingsMenuItem.Click += new System.EventHandler(this.N64VideoPluginSettingsMenuItem_Click);
+			// 
+			// toolStripSeparator10
+			// 
+			this.toolStripSeparator10.Name = "toolStripSeparator10";
+			this.toolStripSeparator10.Size = new System.Drawing.Size(162, 6);
+			// 
+			// SaveConfigMenuItem
+			// 
+			this.SaveConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save;
+			this.SaveConfigMenuItem.Name = "SaveConfigMenuItem";
+			this.SaveConfigMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.SaveConfigMenuItem.Text = "Save Config";
+			this.SaveConfigMenuItem.Click += new System.EventHandler(this.SaveConfigMenuItem_Click);
+			// 
+			// LoadConfigMenuItem
+			// 
+			this.LoadConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig;
+			this.LoadConfigMenuItem.Name = "LoadConfigMenuItem";
+			this.LoadConfigMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.LoadConfigMenuItem.Text = "Load Config";
+			this.LoadConfigMenuItem.Click += new System.EventHandler(this.LoadConfigMenuItem_Click);
+			// 
+			// ToolsSubMenu
+			// 
+			this.ToolsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ToolBoxMenuItem,
             this.toolStripSeparator12,
             this.RamWatchMenuItem,
@@ -1828,146 +1829,146 @@
             this.toolStripSeparator29,
             this.MultiDiskBundlerFileMenuItem,
             this.batchRunnerToolStripMenuItem});
-            this.ToolsSubMenu.Name = "ToolsSubMenu";
-            this.ToolsSubMenu.Size = new System.Drawing.Size(47, 19);
-            this.ToolsSubMenu.Text = "&Tools";
-            this.ToolsSubMenu.DropDownOpened += new System.EventHandler(this.ToolsSubMenu_DropDownOpened);
-            // 
-            // ToolBoxMenuItem
-            // 
-            this.ToolBoxMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ToolBox;
-            this.ToolBoxMenuItem.Name = "ToolBoxMenuItem";
-            this.ToolBoxMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.ToolBoxMenuItem.Text = "&Tool Box";
-            this.ToolBoxMenuItem.Click += new System.EventHandler(this.ToolBoxMenuItem_Click);
-            // 
-            // toolStripSeparator12
-            // 
-            this.toolStripSeparator12.Name = "toolStripSeparator12";
-            this.toolStripSeparator12.Size = new System.Drawing.Size(169, 6);
-            // 
-            // RamWatchMenuItem
-            // 
-            this.RamWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.watch;
-            this.RamWatchMenuItem.Name = "RamWatchMenuItem";
-            this.RamWatchMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.RamWatchMenuItem.Text = "RAM &Watch";
-            this.RamWatchMenuItem.Click += new System.EventHandler(this.RamWatchMenuItem_Click);
-            // 
-            // RamSearchMenuItem
-            // 
-            this.RamSearchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search;
-            this.RamSearchMenuItem.Name = "RamSearchMenuItem";
-            this.RamSearchMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.RamSearchMenuItem.Text = "RAM &Search";
-            this.RamSearchMenuItem.Click += new System.EventHandler(this.RamSearchMenuItem_Click);
-            // 
-            // HexEditorMenuItem
-            // 
-            this.HexEditorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
-            this.HexEditorMenuItem.Name = "HexEditorMenuItem";
-            this.HexEditorMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.HexEditorMenuItem.Text = "&Hex Editor";
-            this.HexEditorMenuItem.Click += new System.EventHandler(this.HexEditorMenuItem_Click);
-            // 
-            // TraceLoggerMenuItem
-            // 
-            this.TraceLoggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil;
-            this.TraceLoggerMenuItem.Name = "TraceLoggerMenuItem";
-            this.TraceLoggerMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.TraceLoggerMenuItem.Text = "Trace &Logger";
-            this.TraceLoggerMenuItem.Click += new System.EventHandler(this.TraceLoggerMenuItem_Click);
-            // 
-            // DebuggerMenuItem
-            // 
-            this.DebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug;
-            this.DebuggerMenuItem.Name = "DebuggerMenuItem";
-            this.DebuggerMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.DebuggerMenuItem.Text = "&Debugger";
-            this.DebuggerMenuItem.Click += new System.EventHandler(this.DebuggerMenuItem_Click);
-            // 
-            // TAStudioMenuItem
-            // 
-            this.TAStudioMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio;
-            this.TAStudioMenuItem.Name = "TAStudioMenuItem";
-            this.TAStudioMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.TAStudioMenuItem.Text = "&TAStudio";
-            this.TAStudioMenuItem.Click += new System.EventHandler(this.TAStudioMenuItem_Click);
-            // 
-            // MacroToolMenuItem
-            // 
-            this.MacroToolMenuItem.Name = "MacroToolMenuItem";
-            this.MacroToolMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.MacroToolMenuItem.Text = "&Macro Tool";
-            this.MacroToolMenuItem.Click += new System.EventHandler(this.MacroToolMenuItem_Click);
-            // 
-            // VirtualPadMenuItem
-            // 
-            this.VirtualPadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
-            this.VirtualPadMenuItem.Name = "VirtualPadMenuItem";
-            this.VirtualPadMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.VirtualPadMenuItem.Text = "Virtual Pad";
-            this.VirtualPadMenuItem.Click += new System.EventHandler(this.VirtualPadMenuItem_Click);
-            // 
-            // AutoHawkMenuItem
-            // 
-            this.AutoHawkMenuItem.Name = "AutoHawkMenuItem";
-            this.AutoHawkMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.AutoHawkMenuItem.Text = "AutoHawk";
-            this.AutoHawkMenuItem.Click += new System.EventHandler(this.AutoHawkMenuItem_Click);
-            // 
-            // BasicBotMenuItem
-            // 
-            this.BasicBotMenuItem.Name = "BasicBotMenuItem";
-            this.BasicBotMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.BasicBotMenuItem.Text = "Basic Bot";
-            this.BasicBotMenuItem.Click += new System.EventHandler(this.BasicBotMenuItem_Click);
-            // 
-            // toolStripSeparator11
-            // 
-            this.toolStripSeparator11.Name = "toolStripSeparator11";
-            this.toolStripSeparator11.Size = new System.Drawing.Size(169, 6);
-            // 
-            // CheatsMenuItem
-            // 
-            this.CheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
-            this.CheatsMenuItem.Name = "CheatsMenuItem";
-            this.CheatsMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.CheatsMenuItem.Text = "Cheats";
-            this.CheatsMenuItem.Click += new System.EventHandler(this.CheatsMenuItem_Click);
-            // 
-            // LuaConsoleMenuItem
-            // 
-            this.LuaConsoleMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lua;
-            this.LuaConsoleMenuItem.Name = "LuaConsoleMenuItem";
-            this.LuaConsoleMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.LuaConsoleMenuItem.Text = "Lua Console";
-            this.LuaConsoleMenuItem.Click += new System.EventHandler(this.LuaConsoleMenuItem_Click);
-            // 
-            // toolStripSeparator29
-            // 
-            this.toolStripSeparator29.Name = "toolStripSeparator29";
-            this.toolStripSeparator29.Size = new System.Drawing.Size(169, 6);
-            // 
-            // MultiDiskBundlerFileMenuItem
-            // 
-            this.MultiDiskBundlerFileMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveConfig;
-            this.MultiDiskBundlerFileMenuItem.Name = "MultiDiskBundlerFileMenuItem";
-            this.MultiDiskBundlerFileMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.MultiDiskBundlerFileMenuItem.Text = "Multi-disk Bundler";
-            this.MultiDiskBundlerFileMenuItem.Click += new System.EventHandler(this.CreateMultigameFileMenuItem_Click);
-            // 
-            // batchRunnerToolStripMenuItem
-            // 
-            this.batchRunnerToolStripMenuItem.Name = "batchRunnerToolStripMenuItem";
-            this.batchRunnerToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-            this.batchRunnerToolStripMenuItem.Text = "Batch Runner";
-            this.batchRunnerToolStripMenuItem.Visible = false;
-            this.batchRunnerToolStripMenuItem.Click += new System.EventHandler(this.batchRunnerToolStripMenuItem_Click);
-            // 
-            // NESSubMenu
-            // 
-            this.NESSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.ToolsSubMenu.Name = "ToolsSubMenu";
+			this.ToolsSubMenu.Size = new System.Drawing.Size(44, 17);
+			this.ToolsSubMenu.Text = "&Tools";
+			this.ToolsSubMenu.DropDownOpened += new System.EventHandler(this.ToolsSubMenu_DropDownOpened);
+			// 
+			// ToolBoxMenuItem
+			// 
+			this.ToolBoxMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ToolBox;
+			this.ToolBoxMenuItem.Name = "ToolBoxMenuItem";
+			this.ToolBoxMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.ToolBoxMenuItem.Text = "&Tool Box";
+			this.ToolBoxMenuItem.Click += new System.EventHandler(this.ToolBoxMenuItem_Click);
+			// 
+			// toolStripSeparator12
+			// 
+			this.toolStripSeparator12.Name = "toolStripSeparator12";
+			this.toolStripSeparator12.Size = new System.Drawing.Size(154, 6);
+			// 
+			// RamWatchMenuItem
+			// 
+			this.RamWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.watch;
+			this.RamWatchMenuItem.Name = "RamWatchMenuItem";
+			this.RamWatchMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.RamWatchMenuItem.Text = "RAM &Watch";
+			this.RamWatchMenuItem.Click += new System.EventHandler(this.RamWatchMenuItem_Click);
+			// 
+			// RamSearchMenuItem
+			// 
+			this.RamSearchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search;
+			this.RamSearchMenuItem.Name = "RamSearchMenuItem";
+			this.RamSearchMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.RamSearchMenuItem.Text = "RAM &Search";
+			this.RamSearchMenuItem.Click += new System.EventHandler(this.RamSearchMenuItem_Click);
+			// 
+			// HexEditorMenuItem
+			// 
+			this.HexEditorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
+			this.HexEditorMenuItem.Name = "HexEditorMenuItem";
+			this.HexEditorMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.HexEditorMenuItem.Text = "&Hex Editor";
+			this.HexEditorMenuItem.Click += new System.EventHandler(this.HexEditorMenuItem_Click);
+			// 
+			// TraceLoggerMenuItem
+			// 
+			this.TraceLoggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil;
+			this.TraceLoggerMenuItem.Name = "TraceLoggerMenuItem";
+			this.TraceLoggerMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.TraceLoggerMenuItem.Text = "Trace &Logger";
+			this.TraceLoggerMenuItem.Click += new System.EventHandler(this.TraceLoggerMenuItem_Click);
+			// 
+			// DebuggerMenuItem
+			// 
+			this.DebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug;
+			this.DebuggerMenuItem.Name = "DebuggerMenuItem";
+			this.DebuggerMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.DebuggerMenuItem.Text = "&Debugger";
+			this.DebuggerMenuItem.Click += new System.EventHandler(this.DebuggerMenuItem_Click);
+			// 
+			// TAStudioMenuItem
+			// 
+			this.TAStudioMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio;
+			this.TAStudioMenuItem.Name = "TAStudioMenuItem";
+			this.TAStudioMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.TAStudioMenuItem.Text = "&TAStudio";
+			this.TAStudioMenuItem.Click += new System.EventHandler(this.TAStudioMenuItem_Click);
+			// 
+			// MacroToolMenuItem
+			// 
+			this.MacroToolMenuItem.Name = "MacroToolMenuItem";
+			this.MacroToolMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.MacroToolMenuItem.Text = "&Macro Tool";
+			this.MacroToolMenuItem.Click += new System.EventHandler(this.MacroToolMenuItem_Click);
+			// 
+			// VirtualPadMenuItem
+			// 
+			this.VirtualPadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
+			this.VirtualPadMenuItem.Name = "VirtualPadMenuItem";
+			this.VirtualPadMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.VirtualPadMenuItem.Text = "Virtual Pad";
+			this.VirtualPadMenuItem.Click += new System.EventHandler(this.VirtualPadMenuItem_Click);
+			// 
+			// AutoHawkMenuItem
+			// 
+			this.AutoHawkMenuItem.Name = "AutoHawkMenuItem";
+			this.AutoHawkMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.AutoHawkMenuItem.Text = "AutoHawk";
+			this.AutoHawkMenuItem.Click += new System.EventHandler(this.AutoHawkMenuItem_Click);
+			// 
+			// BasicBotMenuItem
+			// 
+			this.BasicBotMenuItem.Name = "BasicBotMenuItem";
+			this.BasicBotMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.BasicBotMenuItem.Text = "Basic Bot";
+			this.BasicBotMenuItem.Click += new System.EventHandler(this.BasicBotMenuItem_Click);
+			// 
+			// toolStripSeparator11
+			// 
+			this.toolStripSeparator11.Name = "toolStripSeparator11";
+			this.toolStripSeparator11.Size = new System.Drawing.Size(154, 6);
+			// 
+			// CheatsMenuItem
+			// 
+			this.CheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
+			this.CheatsMenuItem.Name = "CheatsMenuItem";
+			this.CheatsMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.CheatsMenuItem.Text = "Cheats";
+			this.CheatsMenuItem.Click += new System.EventHandler(this.CheatsMenuItem_Click);
+			// 
+			// LuaConsoleMenuItem
+			// 
+			this.LuaConsoleMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lua;
+			this.LuaConsoleMenuItem.Name = "LuaConsoleMenuItem";
+			this.LuaConsoleMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.LuaConsoleMenuItem.Text = "Lua Console";
+			this.LuaConsoleMenuItem.Click += new System.EventHandler(this.LuaConsoleMenuItem_Click);
+			// 
+			// toolStripSeparator29
+			// 
+			this.toolStripSeparator29.Name = "toolStripSeparator29";
+			this.toolStripSeparator29.Size = new System.Drawing.Size(154, 6);
+			// 
+			// MultiDiskBundlerFileMenuItem
+			// 
+			this.MultiDiskBundlerFileMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveConfig;
+			this.MultiDiskBundlerFileMenuItem.Name = "MultiDiskBundlerFileMenuItem";
+			this.MultiDiskBundlerFileMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.MultiDiskBundlerFileMenuItem.Text = "Multi-disk Bundler";
+			this.MultiDiskBundlerFileMenuItem.Click += new System.EventHandler(this.CreateMultigameFileMenuItem_Click);
+			// 
+			// batchRunnerToolStripMenuItem
+			// 
+			this.batchRunnerToolStripMenuItem.Name = "batchRunnerToolStripMenuItem";
+			this.batchRunnerToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.batchRunnerToolStripMenuItem.Text = "Batch Runner";
+			this.batchRunnerToolStripMenuItem.Visible = false;
+			this.batchRunnerToolStripMenuItem.Click += new System.EventHandler(this.batchRunnerToolStripMenuItem_Click);
+			// 
+			// NESSubMenu
+			// 
+			this.NESSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.coreToolStripMenuItem,
             this.toolStripSeparator34,
             this.NESPPUViewerMenuItem,
@@ -1982,135 +1983,135 @@
             this.toolStripSeparator22,
             this.FDSControlsMenuItem,
             this.barcodeReaderToolStripMenuItem});
-            this.NESSubMenu.Name = "NESSubMenu";
-            this.NESSubMenu.Size = new System.Drawing.Size(40, 19);
-            this.NESSubMenu.Text = "&NES";
-            this.NESSubMenu.DropDownOpened += new System.EventHandler(this.NESSubMenu_DropDownOpened);
-            // 
-            // coreToolStripMenuItem
-            // 
-            this.coreToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.NESSubMenu.Name = "NESSubMenu";
+			this.NESSubMenu.Size = new System.Drawing.Size(38, 17);
+			this.NESSubMenu.Text = "&NES";
+			this.NESSubMenu.DropDownOpened += new System.EventHandler(this.NESSubMenu_DropDownOpened);
+			// 
+			// coreToolStripMenuItem
+			// 
+			this.coreToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.quickNESToolStripMenuItem,
             this.nesHawkToolStripMenuItem});
-            this.coreToolStripMenuItem.Name = "coreToolStripMenuItem";
-            this.coreToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.coreToolStripMenuItem.Text = "&Core";
-            this.coreToolStripMenuItem.DropDownOpened += new System.EventHandler(this.coreToolStripMenuItem_DropDownOpened);
-            // 
-            // quickNESToolStripMenuItem
-            // 
-            this.quickNESToolStripMenuItem.Name = "quickNESToolStripMenuItem";
-            this.quickNESToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
-            this.quickNESToolStripMenuItem.Text = "&QuickNes";
-            this.quickNESToolStripMenuItem.Click += new System.EventHandler(this.quickNESToolStripMenuItem_Click);
-            // 
-            // nesHawkToolStripMenuItem
-            // 
-            this.nesHawkToolStripMenuItem.Name = "nesHawkToolStripMenuItem";
-            this.nesHawkToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
-            this.nesHawkToolStripMenuItem.Text = "&NesHawk";
-            this.nesHawkToolStripMenuItem.Click += new System.EventHandler(this.nesHawkToolStripMenuItem_Click);
-            // 
-            // toolStripSeparator34
-            // 
-            this.toolStripSeparator34.Name = "toolStripSeparator34";
-            this.toolStripSeparator34.Size = new System.Drawing.Size(230, 6);
-            // 
-            // NESPPUViewerMenuItem
-            // 
-            this.NESPPUViewerMenuItem.Name = "NESPPUViewerMenuItem";
-            this.NESPPUViewerMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.NESPPUViewerMenuItem.Text = "&PPU Viewer";
-            this.NESPPUViewerMenuItem.Click += new System.EventHandler(this.NESPPUViewerMenuItem_Click);
-            // 
-            // NESNametableViewerMenuItem
-            // 
-            this.NESNametableViewerMenuItem.Name = "NESNametableViewerMenuItem";
-            this.NESNametableViewerMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.NESNametableViewerMenuItem.Text = "&Nametable Viewer";
-            this.NESNametableViewerMenuItem.Click += new System.EventHandler(this.NESNametableViewerMenuItem_Click);
-            // 
-            // NESGameGenieCodesMenuItem
-            // 
-            this.NESGameGenieCodesMenuItem.Name = "NESGameGenieCodesMenuItem";
-            this.NESGameGenieCodesMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.NESGameGenieCodesMenuItem.Text = "&Game Genie Encoder/Decoder";
-            this.NESGameGenieCodesMenuItem.Click += new System.EventHandler(this.NESGameGenieCodesMenuItem_Click);
-            // 
-            // musicRipperToolStripMenuItem
-            // 
-            this.musicRipperToolStripMenuItem.Name = "musicRipperToolStripMenuItem";
-            this.musicRipperToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.musicRipperToolStripMenuItem.Text = "Music Ripper";
-            this.musicRipperToolStripMenuItem.Click += new System.EventHandler(this.musicRipperToolStripMenuItem_Click);
-            // 
-            // toolStripSeparator17
-            // 
-            this.toolStripSeparator17.Name = "toolStripSeparator17";
-            this.toolStripSeparator17.Size = new System.Drawing.Size(230, 6);
-            // 
-            // NesControllerSettingsMenuItem
-            // 
-            this.NesControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
-            this.NesControllerSettingsMenuItem.Name = "NesControllerSettingsMenuItem";
-            this.NesControllerSettingsMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.NesControllerSettingsMenuItem.Text = "Controller Settings...";
-            this.NesControllerSettingsMenuItem.Click += new System.EventHandler(this.NesControllerSettingsMenuItem_Click);
-            // 
-            // NESGraphicSettingsMenuItem
-            // 
-            this.NESGraphicSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.tvIcon;
-            this.NESGraphicSettingsMenuItem.Name = "NESGraphicSettingsMenuItem";
-            this.NESGraphicSettingsMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.NESGraphicSettingsMenuItem.Text = "Graphics Settings...";
-            this.NESGraphicSettingsMenuItem.Click += new System.EventHandler(this.NESGraphicSettingsMenuItem_Click);
-            // 
-            // NESSoundChannelsMenuItem
-            // 
-            this.NESSoundChannelsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS;
-            this.NESSoundChannelsMenuItem.Name = "NESSoundChannelsMenuItem";
-            this.NESSoundChannelsMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.NESSoundChannelsMenuItem.Text = "Sound Channels...";
-            this.NESSoundChannelsMenuItem.Click += new System.EventHandler(this.NESSoundChannelsMenuItem_Click);
-            // 
-            // MovieSettingsMenuItem
-            // 
-            this.MovieSettingsMenuItem.Name = "MovieSettingsMenuItem";
-            this.MovieSettingsMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.MovieSettingsMenuItem.Text = "Advanced Settings...";
-            this.MovieSettingsMenuItem.Click += new System.EventHandler(this.MovieSettingsMenuItem_Click);
-            // 
-            // toolStripSeparator22
-            // 
-            this.toolStripSeparator22.Name = "toolStripSeparator22";
-            this.toolStripSeparator22.Size = new System.Drawing.Size(230, 6);
-            // 
-            // FDSControlsMenuItem
-            // 
-            this.FDSControlsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.coreToolStripMenuItem.Name = "coreToolStripMenuItem";
+			this.coreToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.coreToolStripMenuItem.Text = "&Core";
+			this.coreToolStripMenuItem.DropDownOpened += new System.EventHandler(this.coreToolStripMenuItem_DropDownOpened);
+			// 
+			// quickNESToolStripMenuItem
+			// 
+			this.quickNESToolStripMenuItem.Name = "quickNESToolStripMenuItem";
+			this.quickNESToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
+			this.quickNESToolStripMenuItem.Text = "&QuickNes";
+			this.quickNESToolStripMenuItem.Click += new System.EventHandler(this.quickNESToolStripMenuItem_Click);
+			// 
+			// nesHawkToolStripMenuItem
+			// 
+			this.nesHawkToolStripMenuItem.Name = "nesHawkToolStripMenuItem";
+			this.nesHawkToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
+			this.nesHawkToolStripMenuItem.Text = "&NesHawk";
+			this.nesHawkToolStripMenuItem.Click += new System.EventHandler(this.nesHawkToolStripMenuItem_Click);
+			// 
+			// toolStripSeparator34
+			// 
+			this.toolStripSeparator34.Name = "toolStripSeparator34";
+			this.toolStripSeparator34.Size = new System.Drawing.Size(214, 6);
+			// 
+			// NESPPUViewerMenuItem
+			// 
+			this.NESPPUViewerMenuItem.Name = "NESPPUViewerMenuItem";
+			this.NESPPUViewerMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.NESPPUViewerMenuItem.Text = "&PPU Viewer";
+			this.NESPPUViewerMenuItem.Click += new System.EventHandler(this.NESPPUViewerMenuItem_Click);
+			// 
+			// NESNametableViewerMenuItem
+			// 
+			this.NESNametableViewerMenuItem.Name = "NESNametableViewerMenuItem";
+			this.NESNametableViewerMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.NESNametableViewerMenuItem.Text = "&Nametable Viewer";
+			this.NESNametableViewerMenuItem.Click += new System.EventHandler(this.NESNametableViewerMenuItem_Click);
+			// 
+			// NESGameGenieCodesMenuItem
+			// 
+			this.NESGameGenieCodesMenuItem.Name = "NESGameGenieCodesMenuItem";
+			this.NESGameGenieCodesMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.NESGameGenieCodesMenuItem.Text = "&Game Genie Encoder/Decoder";
+			this.NESGameGenieCodesMenuItem.Click += new System.EventHandler(this.NESGameGenieCodesMenuItem_Click);
+			// 
+			// musicRipperToolStripMenuItem
+			// 
+			this.musicRipperToolStripMenuItem.Name = "musicRipperToolStripMenuItem";
+			this.musicRipperToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.musicRipperToolStripMenuItem.Text = "Music Ripper";
+			this.musicRipperToolStripMenuItem.Click += new System.EventHandler(this.musicRipperToolStripMenuItem_Click);
+			// 
+			// toolStripSeparator17
+			// 
+			this.toolStripSeparator17.Name = "toolStripSeparator17";
+			this.toolStripSeparator17.Size = new System.Drawing.Size(214, 6);
+			// 
+			// NesControllerSettingsMenuItem
+			// 
+			this.NesControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
+			this.NesControllerSettingsMenuItem.Name = "NesControllerSettingsMenuItem";
+			this.NesControllerSettingsMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.NesControllerSettingsMenuItem.Text = "Controller Settings...";
+			this.NesControllerSettingsMenuItem.Click += new System.EventHandler(this.NesControllerSettingsMenuItem_Click);
+			// 
+			// NESGraphicSettingsMenuItem
+			// 
+			this.NESGraphicSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.tvIcon;
+			this.NESGraphicSettingsMenuItem.Name = "NESGraphicSettingsMenuItem";
+			this.NESGraphicSettingsMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.NESGraphicSettingsMenuItem.Text = "Graphics Settings...";
+			this.NESGraphicSettingsMenuItem.Click += new System.EventHandler(this.NESGraphicSettingsMenuItem_Click);
+			// 
+			// NESSoundChannelsMenuItem
+			// 
+			this.NESSoundChannelsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS;
+			this.NESSoundChannelsMenuItem.Name = "NESSoundChannelsMenuItem";
+			this.NESSoundChannelsMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.NESSoundChannelsMenuItem.Text = "Sound Channels...";
+			this.NESSoundChannelsMenuItem.Click += new System.EventHandler(this.NESSoundChannelsMenuItem_Click);
+			// 
+			// MovieSettingsMenuItem
+			// 
+			this.MovieSettingsMenuItem.Name = "MovieSettingsMenuItem";
+			this.MovieSettingsMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.MovieSettingsMenuItem.Text = "Advanced Settings...";
+			this.MovieSettingsMenuItem.Click += new System.EventHandler(this.MovieSettingsMenuItem_Click);
+			// 
+			// toolStripSeparator22
+			// 
+			this.toolStripSeparator22.Name = "toolStripSeparator22";
+			this.toolStripSeparator22.Size = new System.Drawing.Size(214, 6);
+			// 
+			// FDSControlsMenuItem
+			// 
+			this.FDSControlsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.FdsEjectDiskMenuItem});
-            this.FDSControlsMenuItem.Name = "FDSControlsMenuItem";
-            this.FDSControlsMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.FDSControlsMenuItem.Text = "FDS Controls";
-            this.FDSControlsMenuItem.DropDownOpened += new System.EventHandler(this.FdsControlsMenuItem_DropDownOpened);
-            // 
-            // FdsEjectDiskMenuItem
-            // 
-            this.FdsEjectDiskMenuItem.Name = "FdsEjectDiskMenuItem";
-            this.FdsEjectDiskMenuItem.Size = new System.Drawing.Size(124, 22);
-            this.FdsEjectDiskMenuItem.Text = "&Eject Disk";
-            this.FdsEjectDiskMenuItem.Click += new System.EventHandler(this.FdsEjectDiskMenuItem_Click);
-            // 
-            // barcodeReaderToolStripMenuItem
-            // 
-            this.barcodeReaderToolStripMenuItem.Name = "barcodeReaderToolStripMenuItem";
-            this.barcodeReaderToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.barcodeReaderToolStripMenuItem.Text = "Barcode Reader";
-            this.barcodeReaderToolStripMenuItem.Click += new System.EventHandler(this.barcodeReaderToolStripMenuItem_Click);
-            // 
-            // PCESubMenu
-            // 
-            this.PCESubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.FDSControlsMenuItem.Name = "FDSControlsMenuItem";
+			this.FDSControlsMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.FDSControlsMenuItem.Text = "FDS Controls";
+			this.FDSControlsMenuItem.DropDownOpened += new System.EventHandler(this.FdsControlsMenuItem_DropDownOpened);
+			// 
+			// FdsEjectDiskMenuItem
+			// 
+			this.FdsEjectDiskMenuItem.Name = "FdsEjectDiskMenuItem";
+			this.FdsEjectDiskMenuItem.Size = new System.Drawing.Size(120, 22);
+			this.FdsEjectDiskMenuItem.Text = "&Eject Disk";
+			this.FdsEjectDiskMenuItem.Click += new System.EventHandler(this.FdsEjectDiskMenuItem_Click);
+			// 
+			// barcodeReaderToolStripMenuItem
+			// 
+			this.barcodeReaderToolStripMenuItem.Name = "barcodeReaderToolStripMenuItem";
+			this.barcodeReaderToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.barcodeReaderToolStripMenuItem.Text = "Barcode Reader";
+			this.barcodeReaderToolStripMenuItem.Click += new System.EventHandler(this.barcodeReaderToolStripMenuItem_Click);
+			// 
+			// PCESubMenu
+			// 
+			this.PCESubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.PceControllerSettingsMenuItem,
             this.PCEGraphicsSettingsMenuItem,
             this.toolStripSeparator32,
@@ -2122,89 +2123,89 @@
             this.PCEAlwaysPerformSpriteLimitMenuItem,
             this.PCEAlwaysEqualizeVolumesMenuItem,
             this.PCEArcadeCardRewindEnableMenuItem});
-            this.PCESubMenu.Name = "PCESubMenu";
-            this.PCESubMenu.Size = new System.Drawing.Size(40, 19);
-            this.PCESubMenu.Text = "&PCE";
-            this.PCESubMenu.DropDownOpened += new System.EventHandler(this.PCESubMenu_DropDownOpened);
-            // 
-            // PceControllerSettingsMenuItem
-            // 
-            this.PceControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
-            this.PceControllerSettingsMenuItem.Name = "PceControllerSettingsMenuItem";
-            this.PceControllerSettingsMenuItem.Size = new System.Drawing.Size(258, 22);
-            this.PceControllerSettingsMenuItem.Text = "Controller Settings";
-            this.PceControllerSettingsMenuItem.Click += new System.EventHandler(this.PceControllerSettingsMenuItem_Click);
-            // 
-            // PCEGraphicsSettingsMenuItem
-            // 
-            this.PCEGraphicsSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.tvIcon;
-            this.PCEGraphicsSettingsMenuItem.Name = "PCEGraphicsSettingsMenuItem";
-            this.PCEGraphicsSettingsMenuItem.Size = new System.Drawing.Size(258, 22);
-            this.PCEGraphicsSettingsMenuItem.Text = "Graphics Settings";
-            this.PCEGraphicsSettingsMenuItem.Click += new System.EventHandler(this.PCEGraphicsSettingsMenuItem_Click);
-            // 
-            // toolStripSeparator32
-            // 
-            this.toolStripSeparator32.Name = "toolStripSeparator32";
-            this.toolStripSeparator32.Size = new System.Drawing.Size(255, 6);
-            // 
-            // PCEBGViewerMenuItem
-            // 
-            this.PCEBGViewerMenuItem.Name = "PCEBGViewerMenuItem";
-            this.PCEBGViewerMenuItem.Size = new System.Drawing.Size(258, 22);
-            this.PCEBGViewerMenuItem.Text = "&BG Viewer";
-            this.PCEBGViewerMenuItem.Click += new System.EventHandler(this.PCEBGViewerMenuItem_Click);
-            // 
-            // PCEtileViewerToolStripMenuItem
-            // 
-            this.PCEtileViewerToolStripMenuItem.Name = "PCEtileViewerToolStripMenuItem";
-            this.PCEtileViewerToolStripMenuItem.Size = new System.Drawing.Size(258, 22);
-            this.PCEtileViewerToolStripMenuItem.Text = "&Tile Viewer";
-            this.PCEtileViewerToolStripMenuItem.Click += new System.EventHandler(this.PceTileViewerMenuItem_Click);
-            // 
-            // PceSoundDebuggerToolStripMenuItem
-            // 
-            this.PceSoundDebuggerToolStripMenuItem.Name = "PceSoundDebuggerToolStripMenuItem";
-            this.PceSoundDebuggerToolStripMenuItem.Size = new System.Drawing.Size(258, 22);
-            this.PceSoundDebuggerToolStripMenuItem.Text = "&Sound Debugger";
-            this.PceSoundDebuggerToolStripMenuItem.Click += new System.EventHandler(this.PceSoundDebuggerToolStripMenuItem_Click);
-            // 
-            // codeDataLoggerToolStripMenuItem
-            // 
-            this.codeDataLoggerToolStripMenuItem.Name = "codeDataLoggerToolStripMenuItem";
-            this.codeDataLoggerToolStripMenuItem.Size = new System.Drawing.Size(258, 22);
-            this.codeDataLoggerToolStripMenuItem.Text = "Code-Data Logger";
-            this.codeDataLoggerToolStripMenuItem.Click += new System.EventHandler(this.CodeDataLoggerMenuItem_Click);
-            // 
-            // toolStripSeparator25
-            // 
-            this.toolStripSeparator25.Name = "toolStripSeparator25";
-            this.toolStripSeparator25.Size = new System.Drawing.Size(255, 6);
-            // 
-            // PCEAlwaysPerformSpriteLimitMenuItem
-            // 
-            this.PCEAlwaysPerformSpriteLimitMenuItem.Name = "PCEAlwaysPerformSpriteLimitMenuItem";
-            this.PCEAlwaysPerformSpriteLimitMenuItem.Size = new System.Drawing.Size(258, 22);
-            this.PCEAlwaysPerformSpriteLimitMenuItem.Text = "Always Perform Sprite Limit";
-            this.PCEAlwaysPerformSpriteLimitMenuItem.Click += new System.EventHandler(this.PCEAlwaysPerformSpriteLimitMenuItem_Click);
-            // 
-            // PCEAlwaysEqualizeVolumesMenuItem
-            // 
-            this.PCEAlwaysEqualizeVolumesMenuItem.Name = "PCEAlwaysEqualizeVolumesMenuItem";
-            this.PCEAlwaysEqualizeVolumesMenuItem.Size = new System.Drawing.Size(258, 22);
-            this.PCEAlwaysEqualizeVolumesMenuItem.Text = "Always Equalize Volumes (PCE-CD)";
-            this.PCEAlwaysEqualizeVolumesMenuItem.Click += new System.EventHandler(this.PCEAlwaysEqualizeVolumesMenuItem_Click);
-            // 
-            // PCEArcadeCardRewindEnableMenuItem
-            // 
-            this.PCEArcadeCardRewindEnableMenuItem.Name = "PCEArcadeCardRewindEnableMenuItem";
-            this.PCEArcadeCardRewindEnableMenuItem.Size = new System.Drawing.Size(258, 22);
-            this.PCEArcadeCardRewindEnableMenuItem.Text = "Arcade Card Rewind-Enable Hack";
-            this.PCEArcadeCardRewindEnableMenuItem.Click += new System.EventHandler(this.PCEArcadeCardRewindEnableMenuItem_Click);
-            // 
-            // SMSSubMenu
-            // 
-            this.SMSSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.PCESubMenu.Name = "PCESubMenu";
+			this.PCESubMenu.Size = new System.Drawing.Size(38, 17);
+			this.PCESubMenu.Text = "&PCE";
+			this.PCESubMenu.DropDownOpened += new System.EventHandler(this.PCESubMenu_DropDownOpened);
+			// 
+			// PceControllerSettingsMenuItem
+			// 
+			this.PceControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
+			this.PceControllerSettingsMenuItem.Name = "PceControllerSettingsMenuItem";
+			this.PceControllerSettingsMenuItem.Size = new System.Drawing.Size(240, 22);
+			this.PceControllerSettingsMenuItem.Text = "Controller Settings";
+			this.PceControllerSettingsMenuItem.Click += new System.EventHandler(this.PceControllerSettingsMenuItem_Click);
+			// 
+			// PCEGraphicsSettingsMenuItem
+			// 
+			this.PCEGraphicsSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.tvIcon;
+			this.PCEGraphicsSettingsMenuItem.Name = "PCEGraphicsSettingsMenuItem";
+			this.PCEGraphicsSettingsMenuItem.Size = new System.Drawing.Size(240, 22);
+			this.PCEGraphicsSettingsMenuItem.Text = "Graphics Settings";
+			this.PCEGraphicsSettingsMenuItem.Click += new System.EventHandler(this.PCEGraphicsSettingsMenuItem_Click);
+			// 
+			// toolStripSeparator32
+			// 
+			this.toolStripSeparator32.Name = "toolStripSeparator32";
+			this.toolStripSeparator32.Size = new System.Drawing.Size(237, 6);
+			// 
+			// PCEBGViewerMenuItem
+			// 
+			this.PCEBGViewerMenuItem.Name = "PCEBGViewerMenuItem";
+			this.PCEBGViewerMenuItem.Size = new System.Drawing.Size(240, 22);
+			this.PCEBGViewerMenuItem.Text = "&BG Viewer";
+			this.PCEBGViewerMenuItem.Click += new System.EventHandler(this.PCEBGViewerMenuItem_Click);
+			// 
+			// PCEtileViewerToolStripMenuItem
+			// 
+			this.PCEtileViewerToolStripMenuItem.Name = "PCEtileViewerToolStripMenuItem";
+			this.PCEtileViewerToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
+			this.PCEtileViewerToolStripMenuItem.Text = "&Tile Viewer";
+			this.PCEtileViewerToolStripMenuItem.Click += new System.EventHandler(this.PceTileViewerMenuItem_Click);
+			// 
+			// PceSoundDebuggerToolStripMenuItem
+			// 
+			this.PceSoundDebuggerToolStripMenuItem.Name = "PceSoundDebuggerToolStripMenuItem";
+			this.PceSoundDebuggerToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
+			this.PceSoundDebuggerToolStripMenuItem.Text = "&Sound Debugger";
+			this.PceSoundDebuggerToolStripMenuItem.Click += new System.EventHandler(this.PceSoundDebuggerToolStripMenuItem_Click);
+			// 
+			// codeDataLoggerToolStripMenuItem
+			// 
+			this.codeDataLoggerToolStripMenuItem.Name = "codeDataLoggerToolStripMenuItem";
+			this.codeDataLoggerToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
+			this.codeDataLoggerToolStripMenuItem.Text = "Code-Data Logger";
+			this.codeDataLoggerToolStripMenuItem.Click += new System.EventHandler(this.CodeDataLoggerMenuItem_Click);
+			// 
+			// toolStripSeparator25
+			// 
+			this.toolStripSeparator25.Name = "toolStripSeparator25";
+			this.toolStripSeparator25.Size = new System.Drawing.Size(237, 6);
+			// 
+			// PCEAlwaysPerformSpriteLimitMenuItem
+			// 
+			this.PCEAlwaysPerformSpriteLimitMenuItem.Name = "PCEAlwaysPerformSpriteLimitMenuItem";
+			this.PCEAlwaysPerformSpriteLimitMenuItem.Size = new System.Drawing.Size(240, 22);
+			this.PCEAlwaysPerformSpriteLimitMenuItem.Text = "Always Perform Sprite Limit";
+			this.PCEAlwaysPerformSpriteLimitMenuItem.Click += new System.EventHandler(this.PCEAlwaysPerformSpriteLimitMenuItem_Click);
+			// 
+			// PCEAlwaysEqualizeVolumesMenuItem
+			// 
+			this.PCEAlwaysEqualizeVolumesMenuItem.Name = "PCEAlwaysEqualizeVolumesMenuItem";
+			this.PCEAlwaysEqualizeVolumesMenuItem.Size = new System.Drawing.Size(240, 22);
+			this.PCEAlwaysEqualizeVolumesMenuItem.Text = "Always Equalize Volumes (PCE-CD)";
+			this.PCEAlwaysEqualizeVolumesMenuItem.Click += new System.EventHandler(this.PCEAlwaysEqualizeVolumesMenuItem_Click);
+			// 
+			// PCEArcadeCardRewindEnableMenuItem
+			// 
+			this.PCEArcadeCardRewindEnableMenuItem.Name = "PCEArcadeCardRewindEnableMenuItem";
+			this.PCEArcadeCardRewindEnableMenuItem.Size = new System.Drawing.Size(240, 22);
+			this.PCEArcadeCardRewindEnableMenuItem.Text = "Arcade Card Rewind-Enable Hack";
+			this.PCEArcadeCardRewindEnableMenuItem.Click += new System.EventHandler(this.PCEArcadeCardRewindEnableMenuItem_Click);
+			// 
+			// SMSSubMenu
+			// 
+			this.SMSSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.SMSregionToolStripMenuItem,
             this.SMSdisplayToolStripMenuItem,
             this.SMStoolStripMenuItem2,
@@ -2220,383 +2221,391 @@
             this.toolStripSeparator24,
             this.SMSVDPViewerToolStripMenuItem,
             this.GGGameGenieMenuItem});
-            this.SMSSubMenu.Name = "SMSSubMenu";
-            this.SMSSubMenu.Size = new System.Drawing.Size(42, 19);
-            this.SMSSubMenu.Text = "&SMS";
-            this.SMSSubMenu.DropDownOpened += new System.EventHandler(this.SMSSubMenu_DropDownOpened);
-            // 
-            // SMSregionToolStripMenuItem
-            // 
-            this.SMSregionToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.SMSSubMenu.Name = "SMSSubMenu";
+			this.SMSSubMenu.Size = new System.Drawing.Size(39, 17);
+			this.SMSSubMenu.Text = "&SMS";
+			this.SMSSubMenu.DropDownOpened += new System.EventHandler(this.SMSSubMenu_DropDownOpened);
+			// 
+			// SMSregionToolStripMenuItem
+			// 
+			this.SMSregionToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.SMSregionExportToolStripMenuItem,
             this.SMSregionJapanToolStripMenuItem,
             this.SMSregionAutoToolStripMenuItem});
-            this.SMSregionToolStripMenuItem.Name = "SMSregionToolStripMenuItem";
-            this.SMSregionToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
-            this.SMSregionToolStripMenuItem.Text = "Region";
-            // 
-            // SMSregionExportToolStripMenuItem
-            // 
-            this.SMSregionExportToolStripMenuItem.Name = "SMSregionExportToolStripMenuItem";
-            this.SMSregionExportToolStripMenuItem.Size = new System.Drawing.Size(107, 22);
-            this.SMSregionExportToolStripMenuItem.Text = "Export";
-            this.SMSregionExportToolStripMenuItem.Click += new System.EventHandler(this.SMS_RegionExport_Click);
-            // 
-            // SMSregionJapanToolStripMenuItem
-            // 
-            this.SMSregionJapanToolStripMenuItem.Name = "SMSregionJapanToolStripMenuItem";
-            this.SMSregionJapanToolStripMenuItem.Size = new System.Drawing.Size(107, 22);
-            this.SMSregionJapanToolStripMenuItem.Text = "Japan";
-            this.SMSregionJapanToolStripMenuItem.Click += new System.EventHandler(this.SMS_RegionJapan_Click);
-            // 
-            // SMSregionAutoToolStripMenuItem
-            // 
-            this.SMSregionAutoToolStripMenuItem.Name = "SMSregionAutoToolStripMenuItem";
-            this.SMSregionAutoToolStripMenuItem.Size = new System.Drawing.Size(107, 22);
-            this.SMSregionAutoToolStripMenuItem.Text = "Auto";
-            this.SMSregionAutoToolStripMenuItem.Click += new System.EventHandler(this.SMS_RegionAuto_Click);
-            // 
-            // SMSdisplayToolStripMenuItem
-            // 
-            this.SMSdisplayToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.SMSregionToolStripMenuItem.Name = "SMSregionToolStripMenuItem";
+			this.SMSregionToolStripMenuItem.Size = new System.Drawing.Size(221, 22);
+			this.SMSregionToolStripMenuItem.Text = "Region";
+			// 
+			// SMSregionExportToolStripMenuItem
+			// 
+			this.SMSregionExportToolStripMenuItem.Name = "SMSregionExportToolStripMenuItem";
+			this.SMSregionExportToolStripMenuItem.Size = new System.Drawing.Size(106, 22);
+			this.SMSregionExportToolStripMenuItem.Text = "Export";
+			this.SMSregionExportToolStripMenuItem.Click += new System.EventHandler(this.SMS_RegionExport_Click);
+			// 
+			// SMSregionJapanToolStripMenuItem
+			// 
+			this.SMSregionJapanToolStripMenuItem.Name = "SMSregionJapanToolStripMenuItem";
+			this.SMSregionJapanToolStripMenuItem.Size = new System.Drawing.Size(106, 22);
+			this.SMSregionJapanToolStripMenuItem.Text = "Japan";
+			this.SMSregionJapanToolStripMenuItem.Click += new System.EventHandler(this.SMS_RegionJapan_Click);
+			// 
+			// SMSregionAutoToolStripMenuItem
+			// 
+			this.SMSregionAutoToolStripMenuItem.Name = "SMSregionAutoToolStripMenuItem";
+			this.SMSregionAutoToolStripMenuItem.Size = new System.Drawing.Size(106, 22);
+			this.SMSregionAutoToolStripMenuItem.Text = "Auto";
+			this.SMSregionAutoToolStripMenuItem.Click += new System.EventHandler(this.SMS_RegionAuto_Click);
+			// 
+			// SMSdisplayToolStripMenuItem
+			// 
+			this.SMSdisplayToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.SMSdisplayNtscToolStripMenuItem,
             this.SMSdisplayPalToolStripMenuItem,
             this.SMSdisplayAutoToolStripMenuItem});
-            this.SMSdisplayToolStripMenuItem.Name = "SMSdisplayToolStripMenuItem";
-            this.SMSdisplayToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
-            this.SMSdisplayToolStripMenuItem.Text = "Display Type";
-            // 
-            // SMSdisplayNtscToolStripMenuItem
-            // 
-            this.SMSdisplayNtscToolStripMenuItem.Name = "SMSdisplayNtscToolStripMenuItem";
-            this.SMSdisplayNtscToolStripMenuItem.Size = new System.Drawing.Size(104, 22);
-            this.SMSdisplayNtscToolStripMenuItem.Text = "NTSC";
-            this.SMSdisplayNtscToolStripMenuItem.Click += new System.EventHandler(this.SMS_DisplayNTSC_Click);
-            // 
-            // SMSdisplayPalToolStripMenuItem
-            // 
-            this.SMSdisplayPalToolStripMenuItem.Name = "SMSdisplayPalToolStripMenuItem";
-            this.SMSdisplayPalToolStripMenuItem.Size = new System.Drawing.Size(104, 22);
-            this.SMSdisplayPalToolStripMenuItem.Text = "PAL";
-            this.SMSdisplayPalToolStripMenuItem.Click += new System.EventHandler(this.SMS_DisplayPAL_Click);
-            // 
-            // SMSdisplayAutoToolStripMenuItem
-            // 
-            this.SMSdisplayAutoToolStripMenuItem.Name = "SMSdisplayAutoToolStripMenuItem";
-            this.SMSdisplayAutoToolStripMenuItem.Size = new System.Drawing.Size(104, 22);
-            this.SMSdisplayAutoToolStripMenuItem.Text = "Auto";
-            this.SMSdisplayAutoToolStripMenuItem.Click += new System.EventHandler(this.SMS_DisplayAuto_Click);
-            // 
-            // SMStoolStripMenuItem2
-            // 
-            this.SMStoolStripMenuItem2.Name = "SMStoolStripMenuItem2";
-            this.SMStoolStripMenuItem2.Size = new System.Drawing.Size(238, 6);
-            // 
-            // SMSenableBIOSToolStripMenuItem
-            // 
-            this.SMSenableBIOSToolStripMenuItem.Name = "SMSenableBIOSToolStripMenuItem";
-            this.SMSenableBIOSToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
-            this.SMSenableBIOSToolStripMenuItem.Text = "Enable BIOS";
-            this.SMSenableBIOSToolStripMenuItem.Click += new System.EventHandler(this.SMS_BIOS_Click);
-            // 
-            // SMSEnableFMChipMenuItem
-            // 
-            this.SMSEnableFMChipMenuItem.Name = "SMSEnableFMChipMenuItem";
-            this.SMSEnableFMChipMenuItem.Size = new System.Drawing.Size(241, 22);
-            this.SMSEnableFMChipMenuItem.Text = "&Enable FM Chip";
-            this.SMSEnableFMChipMenuItem.Click += new System.EventHandler(this.SMSEnableFMChipMenuItem_Click);
-            // 
-            // SMSOverclockMenuItem
-            // 
-            this.SMSOverclockMenuItem.Name = "SMSOverclockMenuItem";
-            this.SMSOverclockMenuItem.Size = new System.Drawing.Size(241, 22);
-            this.SMSOverclockMenuItem.Text = "&Overclock when Known Safe";
-            this.SMSOverclockMenuItem.Click += new System.EventHandler(this.SMSOverclockMenuItem_Click);
-            // 
-            // SMSForceStereoMenuItem
-            // 
-            this.SMSForceStereoMenuItem.Name = "SMSForceStereoMenuItem";
-            this.SMSForceStereoMenuItem.Size = new System.Drawing.Size(241, 22);
-            this.SMSForceStereoMenuItem.Text = "&Force Stereo Separation";
-            this.SMSForceStereoMenuItem.Click += new System.EventHandler(this.SMSForceStereoMenuItem_Click);
-            // 
-            // SMSSpriteLimitMenuItem
-            // 
-            this.SMSSpriteLimitMenuItem.Name = "SMSSpriteLimitMenuItem";
-            this.SMSSpriteLimitMenuItem.Size = new System.Drawing.Size(241, 22);
-            this.SMSSpriteLimitMenuItem.Text = "Sprite &Limit";
-            this.SMSSpriteLimitMenuItem.Click += new System.EventHandler(this.SMSSpriteLimitMenuItem_Click);
-            // 
-            // SMSFix3DGameDisplayToolStripMenuItem
-            // 
-            this.SMSFix3DGameDisplayToolStripMenuItem.Name = "SMSFix3DGameDisplayToolStripMenuItem";
-            this.SMSFix3DGameDisplayToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
-            this.SMSFix3DGameDisplayToolStripMenuItem.Text = "Fix 3D Game Display";
-            this.SMSFix3DGameDisplayToolStripMenuItem.Click += new System.EventHandler(this.SMSFix3DDisplayMenuItem_Click);
-            // 
-            // ShowClippedRegionsMenuItem
-            // 
-            this.ShowClippedRegionsMenuItem.Name = "ShowClippedRegionsMenuItem";
-            this.ShowClippedRegionsMenuItem.Size = new System.Drawing.Size(241, 22);
-            this.ShowClippedRegionsMenuItem.Text = "&Show Clipped Regions";
-            this.ShowClippedRegionsMenuItem.Click += new System.EventHandler(this.ShowClippedRegionsMenuItem_Click);
-            // 
-            // HighlightActiveDisplayRegionMenuItem
-            // 
-            this.HighlightActiveDisplayRegionMenuItem.Name = "HighlightActiveDisplayRegionMenuItem";
-            this.HighlightActiveDisplayRegionMenuItem.Size = new System.Drawing.Size(241, 22);
-            this.HighlightActiveDisplayRegionMenuItem.Text = "&Highlight Active Display Region";
-            this.HighlightActiveDisplayRegionMenuItem.Click += new System.EventHandler(this.HighlightActiveDisplayRegionMenuItem_Click);
-            // 
-            // SMSGraphicsSettingsMenuItem
-            // 
-            this.SMSGraphicsSettingsMenuItem.Name = "SMSGraphicsSettingsMenuItem";
-            this.SMSGraphicsSettingsMenuItem.Size = new System.Drawing.Size(241, 22);
-            this.SMSGraphicsSettingsMenuItem.Text = "&Graphics Settings...";
-            this.SMSGraphicsSettingsMenuItem.Click += new System.EventHandler(this.SMSGraphicsSettingsMenuItem_Click);
-            // 
-            // toolStripSeparator24
-            // 
-            this.toolStripSeparator24.Name = "toolStripSeparator24";
-            this.toolStripSeparator24.Size = new System.Drawing.Size(238, 6);
-            // 
-            // SMSVDPViewerToolStripMenuItem
-            // 
-            this.SMSVDPViewerToolStripMenuItem.Name = "SMSVDPViewerToolStripMenuItem";
-            this.SMSVDPViewerToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
-            this.SMSVDPViewerToolStripMenuItem.Text = "&VDP Viewer";
-            this.SMSVDPViewerToolStripMenuItem.Click += new System.EventHandler(this.SmsVdpViewerMenuItem_Click);
-            // 
-            // GGGameGenieMenuItem
-            // 
-            this.GGGameGenieMenuItem.Name = "GGGameGenieMenuItem";
-            this.GGGameGenieMenuItem.Size = new System.Drawing.Size(241, 22);
-            this.GGGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder";
-            this.GGGameGenieMenuItem.Click += new System.EventHandler(this.GGGameGenieMenuItem_Click);
-            // 
-            // TI83SubMenu
-            // 
-            this.TI83SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.SMSdisplayToolStripMenuItem.Name = "SMSdisplayToolStripMenuItem";
+			this.SMSdisplayToolStripMenuItem.Size = new System.Drawing.Size(221, 22);
+			this.SMSdisplayToolStripMenuItem.Text = "Display Type";
+			// 
+			// SMSdisplayNtscToolStripMenuItem
+			// 
+			this.SMSdisplayNtscToolStripMenuItem.Name = "SMSdisplayNtscToolStripMenuItem";
+			this.SMSdisplayNtscToolStripMenuItem.Size = new System.Drawing.Size(100, 22);
+			this.SMSdisplayNtscToolStripMenuItem.Text = "NTSC";
+			this.SMSdisplayNtscToolStripMenuItem.Click += new System.EventHandler(this.SMS_DisplayNTSC_Click);
+			// 
+			// SMSdisplayPalToolStripMenuItem
+			// 
+			this.SMSdisplayPalToolStripMenuItem.Name = "SMSdisplayPalToolStripMenuItem";
+			this.SMSdisplayPalToolStripMenuItem.Size = new System.Drawing.Size(100, 22);
+			this.SMSdisplayPalToolStripMenuItem.Text = "PAL";
+			this.SMSdisplayPalToolStripMenuItem.Click += new System.EventHandler(this.SMS_DisplayPAL_Click);
+			// 
+			// SMSdisplayAutoToolStripMenuItem
+			// 
+			this.SMSdisplayAutoToolStripMenuItem.Name = "SMSdisplayAutoToolStripMenuItem";
+			this.SMSdisplayAutoToolStripMenuItem.Size = new System.Drawing.Size(100, 22);
+			this.SMSdisplayAutoToolStripMenuItem.Text = "Auto";
+			this.SMSdisplayAutoToolStripMenuItem.Click += new System.EventHandler(this.SMS_DisplayAuto_Click);
+			// 
+			// SMStoolStripMenuItem2
+			// 
+			this.SMStoolStripMenuItem2.Name = "SMStoolStripMenuItem2";
+			this.SMStoolStripMenuItem2.Size = new System.Drawing.Size(218, 6);
+			// 
+			// SMSenableBIOSToolStripMenuItem
+			// 
+			this.SMSenableBIOSToolStripMenuItem.Name = "SMSenableBIOSToolStripMenuItem";
+			this.SMSenableBIOSToolStripMenuItem.Size = new System.Drawing.Size(221, 22);
+			this.SMSenableBIOSToolStripMenuItem.Text = "Enable BIOS";
+			this.SMSenableBIOSToolStripMenuItem.Click += new System.EventHandler(this.SMS_BIOS_Click);
+			// 
+			// SMSEnableFMChipMenuItem
+			// 
+			this.SMSEnableFMChipMenuItem.Name = "SMSEnableFMChipMenuItem";
+			this.SMSEnableFMChipMenuItem.Size = new System.Drawing.Size(221, 22);
+			this.SMSEnableFMChipMenuItem.Text = "&Enable FM Chip";
+			this.SMSEnableFMChipMenuItem.Click += new System.EventHandler(this.SMSEnableFMChipMenuItem_Click);
+			// 
+			// SMSOverclockMenuItem
+			// 
+			this.SMSOverclockMenuItem.Name = "SMSOverclockMenuItem";
+			this.SMSOverclockMenuItem.Size = new System.Drawing.Size(221, 22);
+			this.SMSOverclockMenuItem.Text = "&Overclock when Known Safe";
+			this.SMSOverclockMenuItem.Click += new System.EventHandler(this.SMSOverclockMenuItem_Click);
+			// 
+			// SMSForceStereoMenuItem
+			// 
+			this.SMSForceStereoMenuItem.Name = "SMSForceStereoMenuItem";
+			this.SMSForceStereoMenuItem.Size = new System.Drawing.Size(221, 22);
+			this.SMSForceStereoMenuItem.Text = "&Force Stereo Separation";
+			this.SMSForceStereoMenuItem.Click += new System.EventHandler(this.SMSForceStereoMenuItem_Click);
+			// 
+			// SMSSpriteLimitMenuItem
+			// 
+			this.SMSSpriteLimitMenuItem.Name = "SMSSpriteLimitMenuItem";
+			this.SMSSpriteLimitMenuItem.Size = new System.Drawing.Size(221, 22);
+			this.SMSSpriteLimitMenuItem.Text = "Sprite &Limit";
+			this.SMSSpriteLimitMenuItem.Click += new System.EventHandler(this.SMSSpriteLimitMenuItem_Click);
+			// 
+			// SMSFix3DGameDisplayToolStripMenuItem
+			// 
+			this.SMSFix3DGameDisplayToolStripMenuItem.Name = "SMSFix3DGameDisplayToolStripMenuItem";
+			this.SMSFix3DGameDisplayToolStripMenuItem.Size = new System.Drawing.Size(221, 22);
+			this.SMSFix3DGameDisplayToolStripMenuItem.Text = "Fix 3D Game Display";
+			this.SMSFix3DGameDisplayToolStripMenuItem.Click += new System.EventHandler(this.SMSFix3DDisplayMenuItem_Click);
+			// 
+			// ShowClippedRegionsMenuItem
+			// 
+			this.ShowClippedRegionsMenuItem.Name = "ShowClippedRegionsMenuItem";
+			this.ShowClippedRegionsMenuItem.Size = new System.Drawing.Size(221, 22);
+			this.ShowClippedRegionsMenuItem.Text = "&Show Clipped Regions";
+			this.ShowClippedRegionsMenuItem.Click += new System.EventHandler(this.ShowClippedRegionsMenuItem_Click);
+			// 
+			// HighlightActiveDisplayRegionMenuItem
+			// 
+			this.HighlightActiveDisplayRegionMenuItem.Name = "HighlightActiveDisplayRegionMenuItem";
+			this.HighlightActiveDisplayRegionMenuItem.Size = new System.Drawing.Size(221, 22);
+			this.HighlightActiveDisplayRegionMenuItem.Text = "&Highlight Active Display Region";
+			this.HighlightActiveDisplayRegionMenuItem.Click += new System.EventHandler(this.HighlightActiveDisplayRegionMenuItem_Click);
+			// 
+			// SMSGraphicsSettingsMenuItem
+			// 
+			this.SMSGraphicsSettingsMenuItem.Name = "SMSGraphicsSettingsMenuItem";
+			this.SMSGraphicsSettingsMenuItem.Size = new System.Drawing.Size(221, 22);
+			this.SMSGraphicsSettingsMenuItem.Text = "&Graphics Settings...";
+			this.SMSGraphicsSettingsMenuItem.Click += new System.EventHandler(this.SMSGraphicsSettingsMenuItem_Click);
+			// 
+			// toolStripSeparator24
+			// 
+			this.toolStripSeparator24.Name = "toolStripSeparator24";
+			this.toolStripSeparator24.Size = new System.Drawing.Size(218, 6);
+			// 
+			// SMSVDPViewerToolStripMenuItem
+			// 
+			this.SMSVDPViewerToolStripMenuItem.Name = "SMSVDPViewerToolStripMenuItem";
+			this.SMSVDPViewerToolStripMenuItem.Size = new System.Drawing.Size(221, 22);
+			this.SMSVDPViewerToolStripMenuItem.Text = "&VDP Viewer";
+			this.SMSVDPViewerToolStripMenuItem.Click += new System.EventHandler(this.SmsVdpViewerMenuItem_Click);
+			// 
+			// GGGameGenieMenuItem
+			// 
+			this.GGGameGenieMenuItem.Name = "GGGameGenieMenuItem";
+			this.GGGameGenieMenuItem.Size = new System.Drawing.Size(221, 22);
+			this.GGGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder";
+			this.GGGameGenieMenuItem.Click += new System.EventHandler(this.GGGameGenieMenuItem_Click);
+			// 
+			// TI83SubMenu
+			// 
+			this.TI83SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.KeypadMenuItem,
             this.LoadTIFileMenuItem,
             this.toolStripSeparator13,
             this.AutoloadKeypadMenuItem,
             this.paletteToolStripMenuItem});
-            this.TI83SubMenu.Name = "TI83SubMenu";
-            this.TI83SubMenu.Size = new System.Drawing.Size(41, 19);
-            this.TI83SubMenu.Text = "TI83";
-            this.TI83SubMenu.DropDownOpened += new System.EventHandler(this.TI83SubMenu_DropDownOpened);
-            // 
-            // KeypadMenuItem
-            // 
-            this.KeypadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.calculator;
-            this.KeypadMenuItem.Name = "KeypadMenuItem";
-            this.KeypadMenuItem.Size = new System.Drawing.Size(165, 22);
-            this.KeypadMenuItem.Text = "Keypad";
-            this.KeypadMenuItem.Click += new System.EventHandler(this.KeypadMenuItem_Click);
-            // 
-            // LoadTIFileMenuItem
-            // 
-            this.LoadTIFileMenuItem.Name = "LoadTIFileMenuItem";
-            this.LoadTIFileMenuItem.Size = new System.Drawing.Size(165, 22);
-            this.LoadTIFileMenuItem.Text = "Load TI-83 File...";
-            this.LoadTIFileMenuItem.Click += new System.EventHandler(this.LoadTIFileMenuItem_Click);
-            // 
-            // toolStripSeparator13
-            // 
-            this.toolStripSeparator13.Name = "toolStripSeparator13";
-            this.toolStripSeparator13.Size = new System.Drawing.Size(162, 6);
-            // 
-            // AutoloadKeypadMenuItem
-            // 
-            this.AutoloadKeypadMenuItem.Checked = true;
-            this.AutoloadKeypadMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.AutoloadKeypadMenuItem.Name = "AutoloadKeypadMenuItem";
-            this.AutoloadKeypadMenuItem.Size = new System.Drawing.Size(165, 22);
-            this.AutoloadKeypadMenuItem.Text = "Autoload Keypad";
-            this.AutoloadKeypadMenuItem.Click += new System.EventHandler(this.AutoloadKeypadMenuItem_Click);
-            // 
-            // paletteToolStripMenuItem
-            // 
-            this.paletteToolStripMenuItem.Name = "paletteToolStripMenuItem";
-            this.paletteToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
-            this.paletteToolStripMenuItem.Text = "Palette...";
-            this.paletteToolStripMenuItem.Click += new System.EventHandler(this.TI83PaletteMenuItem_Click);
-            // 
-            // AtariSubMenu
-            // 
-            this.AtariSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.TI83SubMenu.Name = "TI83SubMenu";
+			this.TI83SubMenu.Size = new System.Drawing.Size(41, 17);
+			this.TI83SubMenu.Text = "TI83";
+			this.TI83SubMenu.DropDownOpened += new System.EventHandler(this.TI83SubMenu_DropDownOpened);
+			// 
+			// KeypadMenuItem
+			// 
+			this.KeypadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.calculator;
+			this.KeypadMenuItem.Name = "KeypadMenuItem";
+			this.KeypadMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.KeypadMenuItem.Text = "Keypad";
+			this.KeypadMenuItem.Click += new System.EventHandler(this.KeypadMenuItem_Click);
+			// 
+			// LoadTIFileMenuItem
+			// 
+			this.LoadTIFileMenuItem.Name = "LoadTIFileMenuItem";
+			this.LoadTIFileMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.LoadTIFileMenuItem.Text = "Load TI-83 File...";
+			this.LoadTIFileMenuItem.Click += new System.EventHandler(this.LoadTIFileMenuItem_Click);
+			// 
+			// toolStripSeparator13
+			// 
+			this.toolStripSeparator13.Name = "toolStripSeparator13";
+			this.toolStripSeparator13.Size = new System.Drawing.Size(154, 6);
+			// 
+			// AutoloadKeypadMenuItem
+			// 
+			this.AutoloadKeypadMenuItem.Checked = true;
+			this.AutoloadKeypadMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.AutoloadKeypadMenuItem.Name = "AutoloadKeypadMenuItem";
+			this.AutoloadKeypadMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.AutoloadKeypadMenuItem.Text = "Autoload Keypad";
+			this.AutoloadKeypadMenuItem.Click += new System.EventHandler(this.AutoloadKeypadMenuItem_Click);
+			// 
+			// paletteToolStripMenuItem
+			// 
+			this.paletteToolStripMenuItem.Name = "paletteToolStripMenuItem";
+			this.paletteToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.paletteToolStripMenuItem.Text = "Palette...";
+			this.paletteToolStripMenuItem.Click += new System.EventHandler(this.TI83PaletteMenuItem_Click);
+			// 
+			// AtariSubMenu
+			// 
+			this.AtariSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.AtariSettingsToolStripMenuItem});
-            this.AtariSubMenu.Name = "AtariSubMenu";
-            this.AtariSubMenu.Size = new System.Drawing.Size(44, 19);
-            this.AtariSubMenu.Text = "&Atari";
-            this.AtariSubMenu.DropDownOpened += new System.EventHandler(this.AtariSubMenu_DropDownOpened);
-            // 
-            // AtariSettingsToolStripMenuItem
-            // 
-            this.AtariSettingsToolStripMenuItem.Name = "AtariSettingsToolStripMenuItem";
-            this.AtariSettingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
-            this.AtariSettingsToolStripMenuItem.Text = "Settings...";
-            this.AtariSettingsToolStripMenuItem.Click += new System.EventHandler(this.AtariSettingsToolStripMenuItem_Click);
-            // 
-            // GBSubMenu
-            // 
-            this.GBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.AtariSubMenu.Name = "AtariSubMenu";
+			this.AtariSubMenu.Size = new System.Drawing.Size(42, 17);
+			this.AtariSubMenu.Text = "&Atari";
+			this.AtariSubMenu.DropDownOpened += new System.EventHandler(this.AtariSubMenu_DropDownOpened);
+			// 
+			// AtariSettingsToolStripMenuItem
+			// 
+			this.AtariSettingsToolStripMenuItem.Name = "AtariSettingsToolStripMenuItem";
+			this.AtariSettingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
+			this.AtariSettingsToolStripMenuItem.Text = "Settings...";
+			this.AtariSettingsToolStripMenuItem.Click += new System.EventHandler(this.AtariSettingsToolStripMenuItem_Click);
+			// 
+			// GBSubMenu
+			// 
+			this.GBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.GBcoreSettingsToolStripMenuItem,
             this.LoadGBInSGBMenuItem,
             this.toolStripSeparator28,
             this.GBGPUViewerMenuItem,
+            this.toolStripMenuItem16,
             this.GBGameGenieMenuItem});
-            this.GBSubMenu.Name = "GBSubMenu";
-            this.GBSubMenu.Size = new System.Drawing.Size(34, 19);
-            this.GBSubMenu.Text = "&GB";
-            this.GBSubMenu.DropDownOpened += new System.EventHandler(this.GBSubMenu_DropDownOpened);
-            // 
-            // GBcoreSettingsToolStripMenuItem
-            // 
-            this.GBcoreSettingsToolStripMenuItem.Name = "GBcoreSettingsToolStripMenuItem";
-            this.GBcoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.GBcoreSettingsToolStripMenuItem.Text = "Settings...";
-            this.GBcoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.GBCoreSettingsMenuItem_Click);
-            // 
-            // LoadGBInSGBMenuItem
-            // 
-            this.LoadGBInSGBMenuItem.Name = "LoadGBInSGBMenuItem";
-            this.LoadGBInSGBMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.LoadGBInSGBMenuItem.Text = "Load GB in SGB";
-            this.LoadGBInSGBMenuItem.Click += new System.EventHandler(this.LoadGBInSGBMenuItem_Click);
-            // 
-            // toolStripSeparator28
-            // 
-            this.toolStripSeparator28.Name = "toolStripSeparator28";
-            this.toolStripSeparator28.Size = new System.Drawing.Size(230, 6);
-            // 
-            // GBGPUViewerMenuItem
-            // 
-            this.GBGPUViewerMenuItem.Name = "GBGPUViewerMenuItem";
-            this.GBGPUViewerMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.GBGPUViewerMenuItem.Text = "GPU Viewer";
-            this.GBGPUViewerMenuItem.Click += new System.EventHandler(this.GBGPUViewerMenuItem_Click);
-            // 
-            // GBGameGenieMenuItem
-            // 
-            this.GBGameGenieMenuItem.Name = "GBGameGenieMenuItem";
-            this.GBGameGenieMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.GBGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder";
-            this.GBGameGenieMenuItem.Click += new System.EventHandler(this.GBGameGenieMenuItem_Click);
-            // 
-            // GBASubMenu
-            // 
-            this.GBASubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.GBSubMenu.Name = "GBSubMenu";
+			this.GBSubMenu.Size = new System.Drawing.Size(32, 17);
+			this.GBSubMenu.Text = "&GB";
+			this.GBSubMenu.DropDownOpened += new System.EventHandler(this.GBSubMenu_DropDownOpened);
+			// 
+			// GBcoreSettingsToolStripMenuItem
+			// 
+			this.GBcoreSettingsToolStripMenuItem.Name = "GBcoreSettingsToolStripMenuItem";
+			this.GBcoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.GBcoreSettingsToolStripMenuItem.Text = "Settings...";
+			this.GBcoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.GBCoreSettingsMenuItem_Click);
+			// 
+			// LoadGBInSGBMenuItem
+			// 
+			this.LoadGBInSGBMenuItem.Name = "LoadGBInSGBMenuItem";
+			this.LoadGBInSGBMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.LoadGBInSGBMenuItem.Text = "Load GB in SGB";
+			this.LoadGBInSGBMenuItem.Click += new System.EventHandler(this.LoadGBInSGBMenuItem_Click);
+			// 
+			// toolStripSeparator28
+			// 
+			this.toolStripSeparator28.Name = "toolStripSeparator28";
+			this.toolStripSeparator28.Size = new System.Drawing.Size(214, 6);
+			// 
+			// GBGPUViewerMenuItem
+			// 
+			this.GBGPUViewerMenuItem.Name = "GBGPUViewerMenuItem";
+			this.GBGPUViewerMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.GBGPUViewerMenuItem.Text = "GPU Viewer";
+			this.GBGPUViewerMenuItem.Click += new System.EventHandler(this.GBGPUViewerMenuItem_Click);
+			// 
+			// toolStripMenuItem16
+			// 
+			this.toolStripMenuItem16.Name = "toolStripMenuItem16";
+			this.toolStripMenuItem16.Size = new System.Drawing.Size(217, 22);
+			this.toolStripMenuItem16.Text = "Code-Data Logger";
+			this.toolStripMenuItem16.Click += new System.EventHandler(this.CodeDataLoggerMenuItem_Click);
+			// 
+			// GBGameGenieMenuItem
+			// 
+			this.GBGameGenieMenuItem.Name = "GBGameGenieMenuItem";
+			this.GBGameGenieMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.GBGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder";
+			this.GBGameGenieMenuItem.Click += new System.EventHandler(this.GBGameGenieMenuItem_Click);
+			// 
+			// GBASubMenu
+			// 
+			this.GBASubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.GBACoreSelectionSubMenu,
             this.GBAcoresettingsToolStripMenuItem1,
             this.toolStripSeparator33,
             this.GbaGpuViewerMenuItem});
-            this.GBASubMenu.Name = "GBASubMenu";
-            this.GBASubMenu.Size = new System.Drawing.Size(42, 19);
-            this.GBASubMenu.Text = "GBA";
-            // 
-            // GBACoreSelectionSubMenu
-            // 
-            this.GBACoreSelectionSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.GBASubMenu.Name = "GBASubMenu";
+			this.GBASubMenu.Size = new System.Drawing.Size(39, 17);
+			this.GBASubMenu.Text = "GBA";
+			// 
+			// GBACoreSelectionSubMenu
+			// 
+			this.GBACoreSelectionSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.GBAmGBAMenuItem,
             this.GBAVBANextMenuItem});
-            this.GBACoreSelectionSubMenu.Name = "GBACoreSelectionSubMenu";
-            this.GBACoreSelectionSubMenu.Size = new System.Drawing.Size(135, 22);
-            this.GBACoreSelectionSubMenu.Text = "&Core";
-            this.GBACoreSelectionSubMenu.DropDownOpened += new System.EventHandler(this.GBACoreSelectionSubMenu_DropDownOpened);
-            // 
-            // GBAmGBAMenuItem
-            // 
-            this.GBAmGBAMenuItem.Name = "GBAmGBAMenuItem";
-            this.GBAmGBAMenuItem.Size = new System.Drawing.Size(125, 22);
-            this.GBAmGBAMenuItem.Text = "mGBA";
-            this.GBAmGBAMenuItem.Click += new System.EventHandler(this.GBAmGBAMenuItem_Click);
-            // 
-            // GBAVBANextMenuItem
-            // 
-            this.GBAVBANextMenuItem.Name = "GBAVBANextMenuItem";
-            this.GBAVBANextMenuItem.Size = new System.Drawing.Size(125, 22);
-            this.GBAVBANextMenuItem.Text = "&VBA-Next";
-            this.GBAVBANextMenuItem.Click += new System.EventHandler(this.GBAVBANextMenuItem_Click);
-            // 
-            // GBAcoresettingsToolStripMenuItem1
-            // 
-            this.GBAcoresettingsToolStripMenuItem1.Name = "GBAcoresettingsToolStripMenuItem1";
-            this.GBAcoresettingsToolStripMenuItem1.Size = new System.Drawing.Size(135, 22);
-            this.GBAcoresettingsToolStripMenuItem1.Text = "&Settings...";
-            this.GBAcoresettingsToolStripMenuItem1.Click += new System.EventHandler(this.GBAcoresettingsToolStripMenuItem1_Click);
-            // 
-            // toolStripSeparator33
-            // 
-            this.toolStripSeparator33.Name = "toolStripSeparator33";
-            this.toolStripSeparator33.Size = new System.Drawing.Size(132, 6);
-            // 
-            // GbaGpuViewerMenuItem
-            // 
-            this.GbaGpuViewerMenuItem.Name = "GbaGpuViewerMenuItem";
-            this.GbaGpuViewerMenuItem.Size = new System.Drawing.Size(135, 22);
-            this.GbaGpuViewerMenuItem.Text = "GPU Viewer";
-            this.GbaGpuViewerMenuItem.Click += new System.EventHandler(this.GbaGpuViewerMenuItem_Click);
-            // 
-            // PSXSubMenu
-            // 
-            this.PSXSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.GBACoreSelectionSubMenu.Name = "GBACoreSelectionSubMenu";
+			this.GBACoreSelectionSubMenu.Size = new System.Drawing.Size(129, 22);
+			this.GBACoreSelectionSubMenu.Text = "&Core";
+			this.GBACoreSelectionSubMenu.DropDownOpened += new System.EventHandler(this.GBACoreSelectionSubMenu_DropDownOpened);
+			// 
+			// GBAmGBAMenuItem
+			// 
+			this.GBAmGBAMenuItem.Name = "GBAmGBAMenuItem";
+			this.GBAmGBAMenuItem.Size = new System.Drawing.Size(120, 22);
+			this.GBAmGBAMenuItem.Text = "mGBA";
+			this.GBAmGBAMenuItem.Click += new System.EventHandler(this.GBAmGBAMenuItem_Click);
+			// 
+			// GBAVBANextMenuItem
+			// 
+			this.GBAVBANextMenuItem.Name = "GBAVBANextMenuItem";
+			this.GBAVBANextMenuItem.Size = new System.Drawing.Size(120, 22);
+			this.GBAVBANextMenuItem.Text = "&VBA-Next";
+			this.GBAVBANextMenuItem.Click += new System.EventHandler(this.GBAVBANextMenuItem_Click);
+			// 
+			// GBAcoresettingsToolStripMenuItem1
+			// 
+			this.GBAcoresettingsToolStripMenuItem1.Name = "GBAcoresettingsToolStripMenuItem1";
+			this.GBAcoresettingsToolStripMenuItem1.Size = new System.Drawing.Size(129, 22);
+			this.GBAcoresettingsToolStripMenuItem1.Text = "&Settings...";
+			this.GBAcoresettingsToolStripMenuItem1.Click += new System.EventHandler(this.GBAcoresettingsToolStripMenuItem1_Click);
+			// 
+			// toolStripSeparator33
+			// 
+			this.toolStripSeparator33.Name = "toolStripSeparator33";
+			this.toolStripSeparator33.Size = new System.Drawing.Size(126, 6);
+			// 
+			// GbaGpuViewerMenuItem
+			// 
+			this.GbaGpuViewerMenuItem.Name = "GbaGpuViewerMenuItem";
+			this.GbaGpuViewerMenuItem.Size = new System.Drawing.Size(129, 22);
+			this.GbaGpuViewerMenuItem.Text = "GPU Viewer";
+			this.GbaGpuViewerMenuItem.Click += new System.EventHandler(this.GbaGpuViewerMenuItem_Click);
+			// 
+			// PSXSubMenu
+			// 
+			this.PSXSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.PSXControllerSettingsMenuItem,
             this.PSXOptionsMenuItem,
             this.PSXDiscControlsMenuItem,
             this.PSXHashDiscsToolStripMenuItem});
-            this.PSXSubMenu.Name = "PSXSubMenu";
-            this.PSXSubMenu.Size = new System.Drawing.Size(39, 19);
-            this.PSXSubMenu.Text = "PSX";
-            this.PSXSubMenu.DropDownOpened += new System.EventHandler(this.PSXSubMenu_DropDownOpened);
-            // 
-            // PSXControllerSettingsMenuItem
-            // 
-            this.PSXControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
-            this.PSXControllerSettingsMenuItem.Name = "PSXControllerSettingsMenuItem";
-            this.PSXControllerSettingsMenuItem.Size = new System.Drawing.Size(234, 22);
-            this.PSXControllerSettingsMenuItem.Text = "Controller / Memcard Settings";
-            this.PSXControllerSettingsMenuItem.Click += new System.EventHandler(this.PSXControllerSettingsMenuItem_Click);
-            // 
-            // PSXOptionsMenuItem
-            // 
-            this.PSXOptionsMenuItem.Name = "PSXOptionsMenuItem";
-            this.PSXOptionsMenuItem.Size = new System.Drawing.Size(234, 22);
-            this.PSXOptionsMenuItem.Text = "&Options";
-            this.PSXOptionsMenuItem.Click += new System.EventHandler(this.PSXOptionsMenuItem_Click);
-            // 
-            // PSXDiscControlsMenuItem
-            // 
-            this.PSXDiscControlsMenuItem.Name = "PSXDiscControlsMenuItem";
-            this.PSXDiscControlsMenuItem.Size = new System.Drawing.Size(234, 22);
-            this.PSXDiscControlsMenuItem.Text = "&Disc Controls";
-            this.PSXDiscControlsMenuItem.Click += new System.EventHandler(this.PSXDiscControlsMenuItem_Click);
-            // 
-            // PSXHashDiscsToolStripMenuItem
-            // 
-            this.PSXHashDiscsToolStripMenuItem.Name = "PSXHashDiscsToolStripMenuItem";
-            this.PSXHashDiscsToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
-            this.PSXHashDiscsToolStripMenuItem.Text = "&Hash Discs";
-            this.PSXHashDiscsToolStripMenuItem.Click += new System.EventHandler(this.PSXHashDiscsToolStripMenuItem_Click);
-            // 
-            // SNESSubMenu
-            // 
-            this.SNESSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.PSXSubMenu.Name = "PSXSubMenu";
+			this.PSXSubMenu.Size = new System.Drawing.Size(37, 17);
+			this.PSXSubMenu.Text = "PSX";
+			this.PSXSubMenu.DropDownOpened += new System.EventHandler(this.PSXSubMenu_DropDownOpened);
+			// 
+			// PSXControllerSettingsMenuItem
+			// 
+			this.PSXControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
+			this.PSXControllerSettingsMenuItem.Name = "PSXControllerSettingsMenuItem";
+			this.PSXControllerSettingsMenuItem.Size = new System.Drawing.Size(216, 22);
+			this.PSXControllerSettingsMenuItem.Text = "Controller / Memcard Settings";
+			this.PSXControllerSettingsMenuItem.Click += new System.EventHandler(this.PSXControllerSettingsMenuItem_Click);
+			// 
+			// PSXOptionsMenuItem
+			// 
+			this.PSXOptionsMenuItem.Name = "PSXOptionsMenuItem";
+			this.PSXOptionsMenuItem.Size = new System.Drawing.Size(216, 22);
+			this.PSXOptionsMenuItem.Text = "&Options";
+			this.PSXOptionsMenuItem.Click += new System.EventHandler(this.PSXOptionsMenuItem_Click);
+			// 
+			// PSXDiscControlsMenuItem
+			// 
+			this.PSXDiscControlsMenuItem.Name = "PSXDiscControlsMenuItem";
+			this.PSXDiscControlsMenuItem.Size = new System.Drawing.Size(216, 22);
+			this.PSXDiscControlsMenuItem.Text = "&Disc Controls";
+			this.PSXDiscControlsMenuItem.Click += new System.EventHandler(this.PSXDiscControlsMenuItem_Click);
+			// 
+			// PSXHashDiscsToolStripMenuItem
+			// 
+			this.PSXHashDiscsToolStripMenuItem.Name = "PSXHashDiscsToolStripMenuItem";
+			this.PSXHashDiscsToolStripMenuItem.Size = new System.Drawing.Size(216, 22);
+			this.PSXHashDiscsToolStripMenuItem.Text = "&Hash Discs";
+			this.PSXHashDiscsToolStripMenuItem.Click += new System.EventHandler(this.PSXHashDiscsToolStripMenuItem_Click);
+			// 
+			// SNESSubMenu
+			// 
+			this.SNESSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.SNESDisplayMenuItem,
             this.toolStripSeparator18,
             this.SnesGfxDebuggerMenuItem,
             this.SnesGBInSGBMenuItem,
             this.SnesGameGenieMenuItem,
             this.SnesOptionsMenuItem});
-            this.SNESSubMenu.Name = "SNESSubMenu";
-            this.SNESSubMenu.Size = new System.Drawing.Size(46, 19);
-            this.SNESSubMenu.Text = "&SNES";
-            this.SNESSubMenu.DropDownOpened += new System.EventHandler(this.SNESSubMenu_DropDownOpened);
-            // 
-            // SNESDisplayMenuItem
-            // 
-            this.SNESDisplayMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.SNESSubMenu.Name = "SNESSubMenu";
+			this.SNESSubMenu.Size = new System.Drawing.Size(44, 17);
+			this.SNESSubMenu.Text = "&SNES";
+			this.SNESSubMenu.DropDownOpened += new System.EventHandler(this.SNESSubMenu_DropDownOpened);
+			// 
+			// SNESDisplayMenuItem
+			// 
+			this.SNESDisplayMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.SnesBg1MenuItem,
             this.SnesBg2MenuItem,
             this.SnesBg3MenuItem,
@@ -2605,349 +2614,349 @@
             this.SnesObj2MenuItem,
             this.SnesObj3MenuItem,
             this.SnesObj4MenuItem});
-            this.SNESDisplayMenuItem.Name = "SNESDisplayMenuItem";
-            this.SNESDisplayMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.SNESDisplayMenuItem.Text = "Display";
-            this.SNESDisplayMenuItem.DropDownOpened += new System.EventHandler(this.SNESDisplayMenuItem_DropDownOpened);
-            // 
-            // SnesBg1MenuItem
-            // 
-            this.SnesBg1MenuItem.Name = "SnesBg1MenuItem";
-            this.SnesBg1MenuItem.Size = new System.Drawing.Size(103, 22);
-            this.SnesBg1MenuItem.Text = "BG 1";
-            this.SnesBg1MenuItem.Click += new System.EventHandler(this.SnesBg1MenuItem_Click);
-            // 
-            // SnesBg2MenuItem
-            // 
-            this.SnesBg2MenuItem.Name = "SnesBg2MenuItem";
-            this.SnesBg2MenuItem.Size = new System.Drawing.Size(103, 22);
-            this.SnesBg2MenuItem.Text = "BG 2";
-            this.SnesBg2MenuItem.Click += new System.EventHandler(this.SnesBg2MenuItem_Click);
-            // 
-            // SnesBg3MenuItem
-            // 
-            this.SnesBg3MenuItem.Name = "SnesBg3MenuItem";
-            this.SnesBg3MenuItem.Size = new System.Drawing.Size(103, 22);
-            this.SnesBg3MenuItem.Text = "BG 3";
-            this.SnesBg3MenuItem.Click += new System.EventHandler(this.SnesBg3MenuItem_Click);
-            // 
-            // SnesBg4MenuItem
-            // 
-            this.SnesBg4MenuItem.Name = "SnesBg4MenuItem";
-            this.SnesBg4MenuItem.Size = new System.Drawing.Size(103, 22);
-            this.SnesBg4MenuItem.Text = "BG 4";
-            this.SnesBg4MenuItem.Click += new System.EventHandler(this.SnesBg4MenuItem_Click);
-            // 
-            // SnesObj1MenuItem
-            // 
-            this.SnesObj1MenuItem.Name = "SnesObj1MenuItem";
-            this.SnesObj1MenuItem.Size = new System.Drawing.Size(103, 22);
-            this.SnesObj1MenuItem.Text = "OBJ 1";
-            this.SnesObj1MenuItem.Click += new System.EventHandler(this.SnesObj1MenuItem_Click);
-            // 
-            // SnesObj2MenuItem
-            // 
-            this.SnesObj2MenuItem.Name = "SnesObj2MenuItem";
-            this.SnesObj2MenuItem.Size = new System.Drawing.Size(103, 22);
-            this.SnesObj2MenuItem.Text = "OBJ 2";
-            this.SnesObj2MenuItem.Click += new System.EventHandler(this.SnesObj2MenuItem_Click);
-            // 
-            // SnesObj3MenuItem
-            // 
-            this.SnesObj3MenuItem.Name = "SnesObj3MenuItem";
-            this.SnesObj3MenuItem.Size = new System.Drawing.Size(103, 22);
-            this.SnesObj3MenuItem.Text = "OBJ 3";
-            this.SnesObj3MenuItem.Click += new System.EventHandler(this.SnesObj3MenuItem_Click);
-            // 
-            // SnesObj4MenuItem
-            // 
-            this.SnesObj4MenuItem.Name = "SnesObj4MenuItem";
-            this.SnesObj4MenuItem.Size = new System.Drawing.Size(103, 22);
-            this.SnesObj4MenuItem.Text = "OBJ 4";
-            this.SnesObj4MenuItem.Click += new System.EventHandler(this.SnesObj4MenuItem_Click);
-            // 
-            // toolStripSeparator18
-            // 
-            this.toolStripSeparator18.Name = "toolStripSeparator18";
-            this.toolStripSeparator18.Size = new System.Drawing.Size(230, 6);
-            // 
-            // SnesGfxDebuggerMenuItem
-            // 
-            this.SnesGfxDebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug;
-            this.SnesGfxDebuggerMenuItem.Name = "SnesGfxDebuggerMenuItem";
-            this.SnesGfxDebuggerMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.SnesGfxDebuggerMenuItem.Text = "Graphics Debugger";
-            this.SnesGfxDebuggerMenuItem.Click += new System.EventHandler(this.SnesGfxDebuggerMenuItem_Click);
-            // 
-            // SnesGBInSGBMenuItem
-            // 
-            this.SnesGBInSGBMenuItem.Name = "SnesGBInSGBMenuItem";
-            this.SnesGBInSGBMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.SnesGBInSGBMenuItem.Text = "Load GB in SGB";
-            this.SnesGBInSGBMenuItem.Click += new System.EventHandler(this.SnesGBInSGBMenuItem_Click);
-            // 
-            // SnesGameGenieMenuItem
-            // 
-            this.SnesGameGenieMenuItem.Name = "SnesGameGenieMenuItem";
-            this.SnesGameGenieMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.SnesGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder";
-            this.SnesGameGenieMenuItem.Click += new System.EventHandler(this.SnesGameGenieMenuItem_Click);
-            // 
-            // SnesOptionsMenuItem
-            // 
-            this.SnesOptionsMenuItem.Name = "SnesOptionsMenuItem";
-            this.SnesOptionsMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.SnesOptionsMenuItem.Text = "&Options";
-            this.SnesOptionsMenuItem.Click += new System.EventHandler(this.SnesOptionsMenuItem_Click);
-            // 
-            // ColecoSubMenu
-            // 
-            this.ColecoSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.SNESDisplayMenuItem.Name = "SNESDisplayMenuItem";
+			this.SNESDisplayMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.SNESDisplayMenuItem.Text = "Display";
+			this.SNESDisplayMenuItem.DropDownOpened += new System.EventHandler(this.SNESDisplayMenuItem_DropDownOpened);
+			// 
+			// SnesBg1MenuItem
+			// 
+			this.SnesBg1MenuItem.Name = "SnesBg1MenuItem";
+			this.SnesBg1MenuItem.Size = new System.Drawing.Size(102, 22);
+			this.SnesBg1MenuItem.Text = "BG 1";
+			this.SnesBg1MenuItem.Click += new System.EventHandler(this.SnesBg1MenuItem_Click);
+			// 
+			// SnesBg2MenuItem
+			// 
+			this.SnesBg2MenuItem.Name = "SnesBg2MenuItem";
+			this.SnesBg2MenuItem.Size = new System.Drawing.Size(102, 22);
+			this.SnesBg2MenuItem.Text = "BG 2";
+			this.SnesBg2MenuItem.Click += new System.EventHandler(this.SnesBg2MenuItem_Click);
+			// 
+			// SnesBg3MenuItem
+			// 
+			this.SnesBg3MenuItem.Name = "SnesBg3MenuItem";
+			this.SnesBg3MenuItem.Size = new System.Drawing.Size(102, 22);
+			this.SnesBg3MenuItem.Text = "BG 3";
+			this.SnesBg3MenuItem.Click += new System.EventHandler(this.SnesBg3MenuItem_Click);
+			// 
+			// SnesBg4MenuItem
+			// 
+			this.SnesBg4MenuItem.Name = "SnesBg4MenuItem";
+			this.SnesBg4MenuItem.Size = new System.Drawing.Size(102, 22);
+			this.SnesBg4MenuItem.Text = "BG 4";
+			this.SnesBg4MenuItem.Click += new System.EventHandler(this.SnesBg4MenuItem_Click);
+			// 
+			// SnesObj1MenuItem
+			// 
+			this.SnesObj1MenuItem.Name = "SnesObj1MenuItem";
+			this.SnesObj1MenuItem.Size = new System.Drawing.Size(102, 22);
+			this.SnesObj1MenuItem.Text = "OBJ 1";
+			this.SnesObj1MenuItem.Click += new System.EventHandler(this.SnesObj1MenuItem_Click);
+			// 
+			// SnesObj2MenuItem
+			// 
+			this.SnesObj2MenuItem.Name = "SnesObj2MenuItem";
+			this.SnesObj2MenuItem.Size = new System.Drawing.Size(102, 22);
+			this.SnesObj2MenuItem.Text = "OBJ 2";
+			this.SnesObj2MenuItem.Click += new System.EventHandler(this.SnesObj2MenuItem_Click);
+			// 
+			// SnesObj3MenuItem
+			// 
+			this.SnesObj3MenuItem.Name = "SnesObj3MenuItem";
+			this.SnesObj3MenuItem.Size = new System.Drawing.Size(102, 22);
+			this.SnesObj3MenuItem.Text = "OBJ 3";
+			this.SnesObj3MenuItem.Click += new System.EventHandler(this.SnesObj3MenuItem_Click);
+			// 
+			// SnesObj4MenuItem
+			// 
+			this.SnesObj4MenuItem.Name = "SnesObj4MenuItem";
+			this.SnesObj4MenuItem.Size = new System.Drawing.Size(102, 22);
+			this.SnesObj4MenuItem.Text = "OBJ 4";
+			this.SnesObj4MenuItem.Click += new System.EventHandler(this.SnesObj4MenuItem_Click);
+			// 
+			// toolStripSeparator18
+			// 
+			this.toolStripSeparator18.Name = "toolStripSeparator18";
+			this.toolStripSeparator18.Size = new System.Drawing.Size(214, 6);
+			// 
+			// SnesGfxDebuggerMenuItem
+			// 
+			this.SnesGfxDebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug;
+			this.SnesGfxDebuggerMenuItem.Name = "SnesGfxDebuggerMenuItem";
+			this.SnesGfxDebuggerMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.SnesGfxDebuggerMenuItem.Text = "Graphics Debugger";
+			this.SnesGfxDebuggerMenuItem.Click += new System.EventHandler(this.SnesGfxDebuggerMenuItem_Click);
+			// 
+			// SnesGBInSGBMenuItem
+			// 
+			this.SnesGBInSGBMenuItem.Name = "SnesGBInSGBMenuItem";
+			this.SnesGBInSGBMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.SnesGBInSGBMenuItem.Text = "Load GB in SGB";
+			this.SnesGBInSGBMenuItem.Click += new System.EventHandler(this.SnesGBInSGBMenuItem_Click);
+			// 
+			// SnesGameGenieMenuItem
+			// 
+			this.SnesGameGenieMenuItem.Name = "SnesGameGenieMenuItem";
+			this.SnesGameGenieMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.SnesGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder";
+			this.SnesGameGenieMenuItem.Click += new System.EventHandler(this.SnesGameGenieMenuItem_Click);
+			// 
+			// SnesOptionsMenuItem
+			// 
+			this.SnesOptionsMenuItem.Name = "SnesOptionsMenuItem";
+			this.SnesOptionsMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.SnesOptionsMenuItem.Text = "&Options";
+			this.SnesOptionsMenuItem.Click += new System.EventHandler(this.SnesOptionsMenuItem_Click);
+			// 
+			// ColecoSubMenu
+			// 
+			this.ColecoSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ColecoSkipBiosMenuItem});
-            this.ColecoSubMenu.Name = "ColecoSubMenu";
-            this.ColecoSubMenu.Size = new System.Drawing.Size(56, 19);
-            this.ColecoSubMenu.Text = "&Coleco";
-            this.ColecoSubMenu.DropDownOpened += new System.EventHandler(this.ColecoSubMenu_DropDownOpened);
-            // 
-            // ColecoSkipBiosMenuItem
-            // 
-            this.ColecoSkipBiosMenuItem.Name = "ColecoSkipBiosMenuItem";
-            this.ColecoSkipBiosMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.ColecoSkipBiosMenuItem.Text = "&Skip BIOS intro";
-            this.ColecoSkipBiosMenuItem.Click += new System.EventHandler(this.ColecoSkipBiosMenuItem_Click);
-            // 
-            // N64SubMenu
-            // 
-            this.N64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.ColecoSubMenu.Name = "ColecoSubMenu";
+			this.ColecoSubMenu.Size = new System.Drawing.Size(51, 17);
+			this.ColecoSubMenu.Text = "&Coleco";
+			this.ColecoSubMenu.DropDownOpened += new System.EventHandler(this.ColecoSubMenu_DropDownOpened);
+			// 
+			// ColecoSkipBiosMenuItem
+			// 
+			this.ColecoSkipBiosMenuItem.Name = "ColecoSkipBiosMenuItem";
+			this.ColecoSkipBiosMenuItem.Size = new System.Drawing.Size(145, 22);
+			this.ColecoSkipBiosMenuItem.Text = "&Skip BIOS intro";
+			this.ColecoSkipBiosMenuItem.Click += new System.EventHandler(this.ColecoSkipBiosMenuItem_Click);
+			// 
+			// N64SubMenu
+			// 
+			this.N64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.N64PluginSettingsMenuItem,
             this.N64ControllerSettingsMenuItem,
             this.toolStripSeparator23,
             this.N64CircularAnalogRangeMenuItem,
             this.MupenStyleLagMenuItem,
             this.N64ExpansionSlotMenuItem});
-            this.N64SubMenu.Name = "N64SubMenu";
-            this.N64SubMenu.Size = new System.Drawing.Size(40, 19);
-            this.N64SubMenu.Text = "N64";
-            this.N64SubMenu.DropDownOpened += new System.EventHandler(this.N64SubMenu_DropDownOpened);
-            // 
-            // N64PluginSettingsMenuItem
-            // 
-            this.N64PluginSettingsMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("N64PluginSettingsMenuItem.Image")));
-            this.N64PluginSettingsMenuItem.Name = "N64PluginSettingsMenuItem";
-            this.N64PluginSettingsMenuItem.Size = new System.Drawing.Size(192, 22);
-            this.N64PluginSettingsMenuItem.Text = "Plugins";
-            this.N64PluginSettingsMenuItem.Click += new System.EventHandler(this.N64PluginSettingsMenuItem_Click);
-            // 
-            // N64ControllerSettingsMenuItem
-            // 
-            this.N64ControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
-            this.N64ControllerSettingsMenuItem.Name = "N64ControllerSettingsMenuItem";
-            this.N64ControllerSettingsMenuItem.Size = new System.Drawing.Size(192, 22);
-            this.N64ControllerSettingsMenuItem.Text = "Controller Settings...";
-            this.N64ControllerSettingsMenuItem.Click += new System.EventHandler(this.N64ControllerSettingsMenuItem_Click);
-            // 
-            // toolStripSeparator23
-            // 
-            this.toolStripSeparator23.Name = "toolStripSeparator23";
-            this.toolStripSeparator23.Size = new System.Drawing.Size(189, 6);
-            // 
-            // N64CircularAnalogRangeMenuItem
-            // 
-            this.N64CircularAnalogRangeMenuItem.Name = "N64CircularAnalogRangeMenuItem";
-            this.N64CircularAnalogRangeMenuItem.Size = new System.Drawing.Size(192, 22);
-            this.N64CircularAnalogRangeMenuItem.Text = "Circular Analog Range";
-            this.N64CircularAnalogRangeMenuItem.Click += new System.EventHandler(this.N64CircularAnalogRangeMenuItem_Click);
-            // 
-            // MupenStyleLagMenuItem
-            // 
-            this.MupenStyleLagMenuItem.Name = "MupenStyleLagMenuItem";
-            this.MupenStyleLagMenuItem.Size = new System.Drawing.Size(192, 22);
-            this.MupenStyleLagMenuItem.Text = "&Non-VI Lag Frames";
-            this.MupenStyleLagMenuItem.Click += new System.EventHandler(this.MupenStyleLagMenuItem_Click);
-            // 
-            // N64ExpansionSlotMenuItem
-            // 
-            this.N64ExpansionSlotMenuItem.Name = "N64ExpansionSlotMenuItem";
-            this.N64ExpansionSlotMenuItem.Size = new System.Drawing.Size(192, 22);
-            this.N64ExpansionSlotMenuItem.Text = "&Use Expansion Slot";
-            this.N64ExpansionSlotMenuItem.Click += new System.EventHandler(this.N64ExpansionSlotMenuItem_Click);
-            // 
-            // SaturnSubMenu
-            // 
-            this.SaturnSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.N64SubMenu.Name = "N64SubMenu";
+			this.N64SubMenu.Size = new System.Drawing.Size(38, 17);
+			this.N64SubMenu.Text = "N64";
+			this.N64SubMenu.DropDownOpened += new System.EventHandler(this.N64SubMenu_DropDownOpened);
+			// 
+			// N64PluginSettingsMenuItem
+			// 
+			this.N64PluginSettingsMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("N64PluginSettingsMenuItem.Image")));
+			this.N64PluginSettingsMenuItem.Name = "N64PluginSettingsMenuItem";
+			this.N64PluginSettingsMenuItem.Size = new System.Drawing.Size(180, 22);
+			this.N64PluginSettingsMenuItem.Text = "Plugins";
+			this.N64PluginSettingsMenuItem.Click += new System.EventHandler(this.N64PluginSettingsMenuItem_Click);
+			// 
+			// N64ControllerSettingsMenuItem
+			// 
+			this.N64ControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
+			this.N64ControllerSettingsMenuItem.Name = "N64ControllerSettingsMenuItem";
+			this.N64ControllerSettingsMenuItem.Size = new System.Drawing.Size(180, 22);
+			this.N64ControllerSettingsMenuItem.Text = "Controller Settings...";
+			this.N64ControllerSettingsMenuItem.Click += new System.EventHandler(this.N64ControllerSettingsMenuItem_Click);
+			// 
+			// toolStripSeparator23
+			// 
+			this.toolStripSeparator23.Name = "toolStripSeparator23";
+			this.toolStripSeparator23.Size = new System.Drawing.Size(177, 6);
+			// 
+			// N64CircularAnalogRangeMenuItem
+			// 
+			this.N64CircularAnalogRangeMenuItem.Name = "N64CircularAnalogRangeMenuItem";
+			this.N64CircularAnalogRangeMenuItem.Size = new System.Drawing.Size(180, 22);
+			this.N64CircularAnalogRangeMenuItem.Text = "Circular Analog Range";
+			this.N64CircularAnalogRangeMenuItem.Click += new System.EventHandler(this.N64CircularAnalogRangeMenuItem_Click);
+			// 
+			// MupenStyleLagMenuItem
+			// 
+			this.MupenStyleLagMenuItem.Name = "MupenStyleLagMenuItem";
+			this.MupenStyleLagMenuItem.Size = new System.Drawing.Size(180, 22);
+			this.MupenStyleLagMenuItem.Text = "&Non-VI Lag Frames";
+			this.MupenStyleLagMenuItem.Click += new System.EventHandler(this.MupenStyleLagMenuItem_Click);
+			// 
+			// N64ExpansionSlotMenuItem
+			// 
+			this.N64ExpansionSlotMenuItem.Name = "N64ExpansionSlotMenuItem";
+			this.N64ExpansionSlotMenuItem.Size = new System.Drawing.Size(180, 22);
+			this.N64ExpansionSlotMenuItem.Text = "&Use Expansion Slot";
+			this.N64ExpansionSlotMenuItem.Click += new System.EventHandler(this.N64ExpansionSlotMenuItem_Click);
+			// 
+			// SaturnSubMenu
+			// 
+			this.SaturnSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.SaturnPreferencesMenuItem});
-            this.SaturnSubMenu.Name = "SaturnSubMenu";
-            this.SaturnSubMenu.Size = new System.Drawing.Size(53, 19);
-            this.SaturnSubMenu.Text = "&Saturn";
-            // 
-            // SaturnPreferencesMenuItem
-            // 
-            this.SaturnPreferencesMenuItem.Name = "SaturnPreferencesMenuItem";
-            this.SaturnPreferencesMenuItem.Size = new System.Drawing.Size(144, 22);
-            this.SaturnPreferencesMenuItem.Text = "Preferences...";
-            this.SaturnPreferencesMenuItem.Click += new System.EventHandler(this.SaturnPreferencesMenuItem_Click);
-            // 
-            // DGBSubMenu
-            // 
-            this.DGBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.SaturnSubMenu.Name = "SaturnSubMenu";
+			this.SaturnSubMenu.Size = new System.Drawing.Size(51, 17);
+			this.SaturnSubMenu.Text = "&Saturn";
+			// 
+			// SaturnPreferencesMenuItem
+			// 
+			this.SaturnPreferencesMenuItem.Name = "SaturnPreferencesMenuItem";
+			this.SaturnPreferencesMenuItem.Size = new System.Drawing.Size(144, 22);
+			this.SaturnPreferencesMenuItem.Text = "Preferences...";
+			this.SaturnPreferencesMenuItem.Click += new System.EventHandler(this.SaturnPreferencesMenuItem_Click);
+			// 
+			// DGBSubMenu
+			// 
+			this.DGBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.DGBsettingsToolStripMenuItem});
-            this.DGBSubMenu.Name = "DGBSubMenu";
-            this.DGBSubMenu.Size = new System.Drawing.Size(59, 19);
-            this.DGBSubMenu.Text = "&GB Link";
-            // 
-            // DGBsettingsToolStripMenuItem
-            // 
-            this.DGBsettingsToolStripMenuItem.Name = "DGBsettingsToolStripMenuItem";
-            this.DGBsettingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
-            this.DGBsettingsToolStripMenuItem.Text = "Settings...";
-            this.DGBsettingsToolStripMenuItem.Click += new System.EventHandler(this.DGBsettingsToolStripMenuItem_Click);
-            // 
-            // GenesisSubMenu
-            // 
-            this.GenesisSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.DGBSubMenu.Name = "DGBSubMenu";
+			this.DGBSubMenu.Size = new System.Drawing.Size(53, 17);
+			this.DGBSubMenu.Text = "&GB Link";
+			// 
+			// DGBsettingsToolStripMenuItem
+			// 
+			this.DGBsettingsToolStripMenuItem.Name = "DGBsettingsToolStripMenuItem";
+			this.DGBsettingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
+			this.DGBsettingsToolStripMenuItem.Text = "Settings...";
+			this.DGBsettingsToolStripMenuItem.Click += new System.EventHandler(this.DGBsettingsToolStripMenuItem_Click);
+			// 
+			// GenesisSubMenu
+			// 
+			this.GenesisSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.vDPViewerToolStripMenuItem,
             this.GenesisGameGenieECDC,
             this.toolStripSeparator26,
             this.GenesisSettingsToolStripMenuItem});
-            this.GenesisSubMenu.Name = "GenesisSubMenu";
-            this.GenesisSubMenu.Size = new System.Drawing.Size(59, 19);
-            this.GenesisSubMenu.Text = "&Genesis";
-            // 
-            // vDPViewerToolStripMenuItem
-            // 
-            this.vDPViewerToolStripMenuItem.Name = "vDPViewerToolStripMenuItem";
-            this.vDPViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.vDPViewerToolStripMenuItem.Text = "&VDP Viewer";
-            this.vDPViewerToolStripMenuItem.Click += new System.EventHandler(this.GenVdpViewerMenuItem_Click);
-            // 
-            // GenesisGameGenieECDC
-            // 
-            this.GenesisGameGenieECDC.Name = "GenesisGameGenieECDC";
-            this.GenesisGameGenieECDC.Size = new System.Drawing.Size(233, 22);
-            this.GenesisGameGenieECDC.Text = "&Game Genie Encoder/Decoder";
-            this.GenesisGameGenieECDC.Click += new System.EventHandler(this.GenesisGameGenieECDC_Click);
-            // 
-            // toolStripSeparator26
-            // 
-            this.toolStripSeparator26.Name = "toolStripSeparator26";
-            this.toolStripSeparator26.Size = new System.Drawing.Size(230, 6);
-            // 
-            // GenesisSettingsToolStripMenuItem
-            // 
-            this.GenesisSettingsToolStripMenuItem.Name = "GenesisSettingsToolStripMenuItem";
-            this.GenesisSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.GenesisSettingsToolStripMenuItem.Text = "&Settings...";
-            this.GenesisSettingsToolStripMenuItem.Click += new System.EventHandler(this.GenesisSettingsMenuItem_Click);
-            // 
-            // wonderSwanToolStripMenuItem
-            // 
-            this.wonderSwanToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.GenesisSubMenu.Name = "GenesisSubMenu";
+			this.GenesisSubMenu.Size = new System.Drawing.Size(56, 17);
+			this.GenesisSubMenu.Text = "&Genesis";
+			// 
+			// vDPViewerToolStripMenuItem
+			// 
+			this.vDPViewerToolStripMenuItem.Name = "vDPViewerToolStripMenuItem";
+			this.vDPViewerToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.vDPViewerToolStripMenuItem.Text = "&VDP Viewer";
+			this.vDPViewerToolStripMenuItem.Click += new System.EventHandler(this.GenVdpViewerMenuItem_Click);
+			// 
+			// GenesisGameGenieECDC
+			// 
+			this.GenesisGameGenieECDC.Name = "GenesisGameGenieECDC";
+			this.GenesisGameGenieECDC.Size = new System.Drawing.Size(217, 22);
+			this.GenesisGameGenieECDC.Text = "&Game Genie Encoder/Decoder";
+			this.GenesisGameGenieECDC.Click += new System.EventHandler(this.GenesisGameGenieECDC_Click);
+			// 
+			// toolStripSeparator26
+			// 
+			this.toolStripSeparator26.Name = "toolStripSeparator26";
+			this.toolStripSeparator26.Size = new System.Drawing.Size(214, 6);
+			// 
+			// GenesisSettingsToolStripMenuItem
+			// 
+			this.GenesisSettingsToolStripMenuItem.Name = "GenesisSettingsToolStripMenuItem";
+			this.GenesisSettingsToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.GenesisSettingsToolStripMenuItem.Text = "&Settings...";
+			this.GenesisSettingsToolStripMenuItem.Click += new System.EventHandler(this.GenesisSettingsMenuItem_Click);
+			// 
+			// wonderSwanToolStripMenuItem
+			// 
+			this.wonderSwanToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.settingsToolStripMenuItem});
-            this.wonderSwanToolStripMenuItem.Name = "wonderSwanToolStripMenuItem";
-            this.wonderSwanToolStripMenuItem.Size = new System.Drawing.Size(89, 19);
-            this.wonderSwanToolStripMenuItem.Text = "&WonderSwan";
-            // 
-            // settingsToolStripMenuItem
-            // 
-            this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
-            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
-            this.settingsToolStripMenuItem.Text = "&Settings...";
-            this.settingsToolStripMenuItem.Click += new System.EventHandler(this.WondersawnSettingsMenuItem_Click);
-            // 
-            // AppleSubMenu
-            // 
-            this.AppleSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.wonderSwanToolStripMenuItem.Name = "wonderSwanToolStripMenuItem";
+			this.wonderSwanToolStripMenuItem.Size = new System.Drawing.Size(83, 17);
+			this.wonderSwanToolStripMenuItem.Text = "&WonderSwan";
+			// 
+			// settingsToolStripMenuItem
+			// 
+			this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
+			this.settingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
+			this.settingsToolStripMenuItem.Text = "&Settings...";
+			this.settingsToolStripMenuItem.Click += new System.EventHandler(this.WondersawnSettingsMenuItem_Click);
+			// 
+			// AppleSubMenu
+			// 
+			this.AppleSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.AppleDisksSubMenu,
             this.settingsToolStripMenuItem1});
-            this.AppleSubMenu.Name = "AppleSubMenu";
-            this.AppleSubMenu.Size = new System.Drawing.Size(50, 19);
-            this.AppleSubMenu.Text = "Apple";
-            this.AppleSubMenu.DropDownOpened += new System.EventHandler(this.AppleSubMenu_DropDownOpened);
-            // 
-            // AppleDisksSubMenu
-            // 
-            this.AppleDisksSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.AppleSubMenu.Name = "AppleSubMenu";
+			this.AppleSubMenu.Size = new System.Drawing.Size(46, 17);
+			this.AppleSubMenu.Text = "Apple";
+			this.AppleSubMenu.DropDownOpened += new System.EventHandler(this.AppleSubMenu_DropDownOpened);
+			// 
+			// AppleDisksSubMenu
+			// 
+			this.AppleDisksSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripSeparator31});
-            this.AppleDisksSubMenu.Name = "AppleDisksSubMenu";
-            this.AppleDisksSubMenu.Size = new System.Drawing.Size(125, 22);
-            this.AppleDisksSubMenu.Text = "Disks";
-            this.AppleDisksSubMenu.DropDownOpened += new System.EventHandler(this.AppleDisksSubMenu_DropDownOpened);
-            // 
-            // toolStripSeparator31
-            // 
-            this.toolStripSeparator31.Name = "toolStripSeparator31";
-            this.toolStripSeparator31.Size = new System.Drawing.Size(57, 6);
-            // 
-            // settingsToolStripMenuItem1
-            // 
-            this.settingsToolStripMenuItem1.Name = "settingsToolStripMenuItem1";
-            this.settingsToolStripMenuItem1.Size = new System.Drawing.Size(125, 22);
-            this.settingsToolStripMenuItem1.Text = "&Settings...";
-            this.settingsToolStripMenuItem1.Click += new System.EventHandler(this.settingsToolStripMenuItem1_Click_1);
-            // 
-            // C64SubMenu
-            // 
-            this.C64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.AppleDisksSubMenu.Name = "AppleDisksSubMenu";
+			this.AppleDisksSubMenu.Size = new System.Drawing.Size(125, 22);
+			this.AppleDisksSubMenu.Text = "Disks";
+			this.AppleDisksSubMenu.DropDownOpened += new System.EventHandler(this.AppleDisksSubMenu_DropDownOpened);
+			// 
+			// toolStripSeparator31
+			// 
+			this.toolStripSeparator31.Name = "toolStripSeparator31";
+			this.toolStripSeparator31.Size = new System.Drawing.Size(57, 6);
+			// 
+			// settingsToolStripMenuItem1
+			// 
+			this.settingsToolStripMenuItem1.Name = "settingsToolStripMenuItem1";
+			this.settingsToolStripMenuItem1.Size = new System.Drawing.Size(125, 22);
+			this.settingsToolStripMenuItem1.Text = "&Settings...";
+			this.settingsToolStripMenuItem1.Click += new System.EventHandler(this.settingsToolStripMenuItem1_Click_1);
+			// 
+			// C64SubMenu
+			// 
+			this.C64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.C64SettingsMenuItem});
-            this.C64SubMenu.Name = "C64SubMenu";
-            this.C64SubMenu.Size = new System.Drawing.Size(39, 19);
-            this.C64SubMenu.Text = "&C64";
-            // 
-            // C64SettingsMenuItem
-            // 
-            this.C64SettingsMenuItem.Name = "C64SettingsMenuItem";
-            this.C64SettingsMenuItem.Size = new System.Drawing.Size(125, 22);
-            this.C64SettingsMenuItem.Text = "&Settings...";
-            this.C64SettingsMenuItem.Click += new System.EventHandler(this.C64SettingsMenuItem_Click);
-            // 
-            // HelpSubMenu
-            // 
-            this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.C64SubMenu.Name = "C64SubMenu";
+			this.C64SubMenu.Size = new System.Drawing.Size(38, 17);
+			this.C64SubMenu.Text = "&C64";
+			// 
+			// C64SettingsMenuItem
+			// 
+			this.C64SettingsMenuItem.Name = "C64SettingsMenuItem";
+			this.C64SettingsMenuItem.Size = new System.Drawing.Size(125, 22);
+			this.C64SettingsMenuItem.Text = "&Settings...";
+			this.C64SettingsMenuItem.Click += new System.EventHandler(this.C64SettingsMenuItem_Click);
+			// 
+			// HelpSubMenu
+			// 
+			this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.OnlineHelpMenuItem,
             this.ForumsMenuItem,
             this.FeaturesMenuItem,
             this.AboutMenuItem});
-            this.HelpSubMenu.Name = "HelpSubMenu";
-            this.HelpSubMenu.Size = new System.Drawing.Size(44, 19);
-            this.HelpSubMenu.Text = "&Help";
-            this.HelpSubMenu.DropDownOpened += new System.EventHandler(this.HelpSubMenu_DropDownOpened);
-            // 
-            // OnlineHelpMenuItem
-            // 
-            this.OnlineHelpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help;
-            this.OnlineHelpMenuItem.Name = "OnlineHelpMenuItem";
-            this.OnlineHelpMenuItem.Size = new System.Drawing.Size(146, 22);
-            this.OnlineHelpMenuItem.Text = "&Online Help...";
-            this.OnlineHelpMenuItem.Click += new System.EventHandler(this.OnlineHelpMenuItem_Click);
-            // 
-            // ForumsMenuItem
-            // 
-            this.ForumsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio;
-            this.ForumsMenuItem.Name = "ForumsMenuItem";
-            this.ForumsMenuItem.Size = new System.Drawing.Size(146, 22);
-            this.ForumsMenuItem.Text = "Forums...";
-            this.ForumsMenuItem.Click += new System.EventHandler(this.ForumsMenuItem_Click);
-            // 
-            // FeaturesMenuItem
-            // 
-            this.FeaturesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.kitchensink;
-            this.FeaturesMenuItem.Name = "FeaturesMenuItem";
-            this.FeaturesMenuItem.Size = new System.Drawing.Size(146, 22);
-            this.FeaturesMenuItem.Text = "&Features";
-            this.FeaturesMenuItem.Click += new System.EventHandler(this.FeaturesMenuItem_Click);
-            // 
-            // AboutMenuItem
-            // 
-            this.AboutMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall;
-            this.AboutMenuItem.Name = "AboutMenuItem";
-            this.AboutMenuItem.Size = new System.Drawing.Size(146, 22);
-            this.AboutMenuItem.Text = "&About";
-            this.AboutMenuItem.Click += new System.EventHandler(this.AboutMenuItem_Click);
-            // 
-            // MainStatusBar
-            // 
-            this.MainStatusBar.ClickThrough = true;
-            this.MainStatusBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.HelpSubMenu.Name = "HelpSubMenu";
+			this.HelpSubMenu.Size = new System.Drawing.Size(40, 17);
+			this.HelpSubMenu.Text = "&Help";
+			this.HelpSubMenu.DropDownOpened += new System.EventHandler(this.HelpSubMenu_DropDownOpened);
+			// 
+			// OnlineHelpMenuItem
+			// 
+			this.OnlineHelpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help;
+			this.OnlineHelpMenuItem.Name = "OnlineHelpMenuItem";
+			this.OnlineHelpMenuItem.Size = new System.Drawing.Size(140, 22);
+			this.OnlineHelpMenuItem.Text = "&Online Help...";
+			this.OnlineHelpMenuItem.Click += new System.EventHandler(this.OnlineHelpMenuItem_Click);
+			// 
+			// ForumsMenuItem
+			// 
+			this.ForumsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio;
+			this.ForumsMenuItem.Name = "ForumsMenuItem";
+			this.ForumsMenuItem.Size = new System.Drawing.Size(140, 22);
+			this.ForumsMenuItem.Text = "Forums...";
+			this.ForumsMenuItem.Click += new System.EventHandler(this.ForumsMenuItem_Click);
+			// 
+			// FeaturesMenuItem
+			// 
+			this.FeaturesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.kitchensink;
+			this.FeaturesMenuItem.Name = "FeaturesMenuItem";
+			this.FeaturesMenuItem.Size = new System.Drawing.Size(140, 22);
+			this.FeaturesMenuItem.Text = "&Features";
+			this.FeaturesMenuItem.Click += new System.EventHandler(this.FeaturesMenuItem_Click);
+			// 
+			// AboutMenuItem
+			// 
+			this.AboutMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall;
+			this.AboutMenuItem.Name = "AboutMenuItem";
+			this.AboutMenuItem.Size = new System.Drawing.Size(140, 22);
+			this.AboutMenuItem.Text = "&About";
+			this.AboutMenuItem.Click += new System.EventHandler(this.AboutMenuItem_Click);
+			// 
+			// MainStatusBar
+			// 
+			this.MainStatusBar.ClickThrough = true;
+			this.MainStatusBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.DumpStatusButton,
             this.EmuStatus,
             this.PlayRecordStatusButton,
@@ -2972,225 +2981,225 @@
             this.ProfileFirstBootLabel,
             this.LinkConnectStatusBarButton,
             this.UpdateNotification});
-            this.MainStatusBar.Location = new System.Drawing.Point(0, 386);
-            this.MainStatusBar.Name = "MainStatusBar";
-            this.MainStatusBar.ShowItemToolTips = true;
-            this.MainStatusBar.Size = new System.Drawing.Size(470, 22);
-            this.MainStatusBar.SizingGrip = false;
-            this.MainStatusBar.TabIndex = 1;
-            this.MainStatusBar.Text = "0";
-            // 
-            // DumpStatusButton
-            // 
-            this.DumpStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.DumpStatusButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank;
-            this.DumpStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.DumpStatusButton.Name = "DumpStatusButton";
-            this.DumpStatusButton.ShowDropDownArrow = false;
-            this.DumpStatusButton.Size = new System.Drawing.Size(20, 20);
-            this.DumpStatusButton.Text = "No ROM loaded";
-            this.DumpStatusButton.Click += new System.EventHandler(this.DumpStatusButton_Click);
-            // 
-            // EmuStatus
-            // 
-            this.EmuStatus.Name = "EmuStatus";
-            this.EmuStatus.Size = new System.Drawing.Size(0, 17);
-            // 
-            // PlayRecordStatusButton
-            // 
-            this.PlayRecordStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.PlayRecordStatusButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank;
-            this.PlayRecordStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.PlayRecordStatusButton.Name = "PlayRecordStatusButton";
-            this.PlayRecordStatusButton.ShowDropDownArrow = false;
-            this.PlayRecordStatusButton.Size = new System.Drawing.Size(20, 20);
-            this.PlayRecordStatusButton.Text = "No movie is active";
-            // 
-            // PauseStatusButton
-            // 
-            this.PauseStatusButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.PauseStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.PauseStatusButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank;
-            this.PauseStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.PauseStatusButton.Name = "PauseStatusButton";
-            this.PauseStatusButton.ShowDropDownArrow = false;
-            this.PauseStatusButton.Size = new System.Drawing.Size(20, 20);
-            this.PauseStatusButton.Text = "toolStripDropDownButton1";
-            this.PauseStatusButton.ToolTipText = "Emulator is paused";
-            this.PauseStatusButton.Click += new System.EventHandler(this.PauseMenuItem_Click);
-            // 
-            // RebootStatusBarIcon
-            // 
-            this.RebootStatusBarIcon.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.RebootStatusBarIcon.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot;
-            this.RebootStatusBarIcon.Name = "RebootStatusBarIcon";
-            this.RebootStatusBarIcon.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.RebootStatusBarIcon.Size = new System.Drawing.Size(16, 17);
-            this.RebootStatusBarIcon.Text = "Reboot";
-            this.RebootStatusBarIcon.ToolTipText = "A reboot of the core is needed for a setting change to take affect";
-            this.RebootStatusBarIcon.Click += new System.EventHandler(this.PowerMenuItem_Click);
-            // 
-            // AVIStatusLabel
-            // 
-            this.AVIStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.AVIStatusLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank;
-            this.AVIStatusLabel.Name = "AVIStatusLabel";
-            this.AVIStatusLabel.Size = new System.Drawing.Size(16, 17);
-            this.AVIStatusLabel.Text = "AVI Capture";
-            // 
-            // LedLightStatusLabel
-            // 
-            this.LedLightStatusLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LightOff;
-            this.LedLightStatusLabel.Name = "LedLightStatusLabel";
-            this.LedLightStatusLabel.Size = new System.Drawing.Size(16, 17);
-            this.LedLightStatusLabel.ToolTipText = "Disk Drive LED Light";
-            // 
-            // SaveSlotsStatusLabel
-            // 
-            this.SaveSlotsStatusLabel.BackColor = System.Drawing.SystemColors.Control;
-            this.SaveSlotsStatusLabel.Name = "SaveSlotsStatusLabel";
-            this.SaveSlotsStatusLabel.Size = new System.Drawing.Size(58, 17);
-            this.SaveSlotsStatusLabel.Text = "Save slots";
-            // 
-            // Slot1StatusButton
-            // 
-            this.Slot1StatusButton.Name = "Slot1StatusButton";
-            this.Slot1StatusButton.Size = new System.Drawing.Size(13, 17);
-            this.Slot1StatusButton.Text = "1";
-            this.Slot1StatusButton.ToolTipText = "Save slot 1";
-            this.Slot1StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
-            // 
-            // Slot2StatusButton
-            // 
-            this.Slot2StatusButton.Name = "Slot2StatusButton";
-            this.Slot2StatusButton.Size = new System.Drawing.Size(13, 17);
-            this.Slot2StatusButton.Text = "2";
-            this.Slot2StatusButton.ToolTipText = "Save slot 2";
-            this.Slot2StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
-            // 
-            // Slot3StatusButton
-            // 
-            this.Slot3StatusButton.Name = "Slot3StatusButton";
-            this.Slot3StatusButton.Size = new System.Drawing.Size(13, 17);
-            this.Slot3StatusButton.Text = "3";
-            this.Slot3StatusButton.ToolTipText = "Save slot 3";
-            this.Slot3StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
-            // 
-            // Slot4StatusButton
-            // 
-            this.Slot4StatusButton.Name = "Slot4StatusButton";
-            this.Slot4StatusButton.Size = new System.Drawing.Size(13, 17);
-            this.Slot4StatusButton.Text = "4";
-            this.Slot4StatusButton.ToolTipText = "Save slot 4";
-            this.Slot4StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
-            // 
-            // Slot5StatusButton
-            // 
-            this.Slot5StatusButton.Name = "Slot5StatusButton";
-            this.Slot5StatusButton.Size = new System.Drawing.Size(13, 17);
-            this.Slot5StatusButton.Text = "5";
-            this.Slot5StatusButton.ToolTipText = "Save slot 5";
-            this.Slot5StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
-            // 
-            // Slot6StatusButton
-            // 
-            this.Slot6StatusButton.Name = "Slot6StatusButton";
-            this.Slot6StatusButton.Size = new System.Drawing.Size(13, 17);
-            this.Slot6StatusButton.Text = "6";
-            this.Slot6StatusButton.ToolTipText = "Save slot 6";
-            this.Slot6StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
-            // 
-            // Slot7StatusButton
-            // 
-            this.Slot7StatusButton.Name = "Slot7StatusButton";
-            this.Slot7StatusButton.Size = new System.Drawing.Size(13, 17);
-            this.Slot7StatusButton.Text = "7";
-            this.Slot7StatusButton.ToolTipText = "Save slot 7";
-            this.Slot7StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
-            // 
-            // Slot8StatusButton
-            // 
-            this.Slot8StatusButton.Name = "Slot8StatusButton";
-            this.Slot8StatusButton.Size = new System.Drawing.Size(13, 17);
-            this.Slot8StatusButton.Text = "8";
-            this.Slot8StatusButton.ToolTipText = "Save slot 8";
-            this.Slot8StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
-            // 
-            // Slot9StatusButton
-            // 
-            this.Slot9StatusButton.Name = "Slot9StatusButton";
-            this.Slot9StatusButton.Size = new System.Drawing.Size(13, 17);
-            this.Slot9StatusButton.Text = "9";
-            this.Slot9StatusButton.ToolTipText = "Save slot 9";
-            this.Slot9StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
-            // 
-            // Slot0StatusButton
-            // 
-            this.Slot0StatusButton.Name = "Slot0StatusButton";
-            this.Slot0StatusButton.Size = new System.Drawing.Size(13, 17);
-            this.Slot0StatusButton.Text = "0";
-            this.Slot0StatusButton.ToolTipText = "Save slot 0";
-            this.Slot0StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
-            // 
-            // CheatStatusButton
-            // 
-            this.CheatStatusButton.Name = "CheatStatusButton";
-            this.CheatStatusButton.Size = new System.Drawing.Size(0, 17);
-            this.CheatStatusButton.Click += new System.EventHandler(this.FreezeStatus_Click);
-            // 
-            // KeyPriorityStatusLabel
-            // 
-            this.KeyPriorityStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.KeyPriorityStatusLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Both;
-            this.KeyPriorityStatusLabel.Margin = new System.Windows.Forms.Padding(5, 3, 5, 0);
-            this.KeyPriorityStatusLabel.Name = "KeyPriorityStatusLabel";
-            this.KeyPriorityStatusLabel.Size = new System.Drawing.Size(16, 19);
-            this.KeyPriorityStatusLabel.Text = "KeyPriority";
-            this.KeyPriorityStatusLabel.Click += new System.EventHandler(this.KeyPriorityStatusLabel_Click);
-            // 
-            // CoreNameStatusBarButton
-            // 
-            this.CoreNameStatusBarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall;
-            this.CoreNameStatusBarButton.Name = "CoreNameStatusBarButton";
-            this.CoreNameStatusBarButton.Size = new System.Drawing.Size(71, 17);
-            this.CoreNameStatusBarButton.Text = "Neshawk";
-            // 
-            // ProfileFirstBootLabel
-            // 
-            this.ProfileFirstBootLabel.AutoToolTip = true;
-            this.ProfileFirstBootLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.ProfileFirstBootLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.user_blue_small;
-            this.ProfileFirstBootLabel.Name = "ProfileFirstBootLabel";
-            this.ProfileFirstBootLabel.Size = new System.Drawing.Size(16, 17);
-            this.ProfileFirstBootLabel.Text = "ProfileFirstBootLabel";
-            this.ProfileFirstBootLabel.ToolTipText = "Set up your profile before use";
-            this.ProfileFirstBootLabel.Visible = false;
-            this.ProfileFirstBootLabel.Click += new System.EventHandler(this.ProfileFirstBootLabel_Click);
-            // 
-            // LinkConnectStatusBarButton
-            // 
-            this.LinkConnectStatusBarButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.LinkConnectStatusBarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.connect_16x16;
-            this.LinkConnectStatusBarButton.Name = "LinkConnectStatusBarButton";
-            this.LinkConnectStatusBarButton.Size = new System.Drawing.Size(16, 17);
-            this.LinkConnectStatusBarButton.Text = "Link connection is currently enabled";
-            this.LinkConnectStatusBarButton.ToolTipText = "Link connection is currently enabled";
-            this.LinkConnectStatusBarButton.Click += new System.EventHandler(this.LinkConnectStatusBarButton_Click);
-            // 
-            // UpdateNotification
-            // 
-            this.UpdateNotification.IsLink = true;
-            this.UpdateNotification.LinkColor = System.Drawing.Color.Red;
-            this.UpdateNotification.Name = "UpdateNotification";
-            this.UpdateNotification.Size = new System.Drawing.Size(46, 17);
-            this.UpdateNotification.Spring = true;
-            this.UpdateNotification.Text = "New version available!";
-            this.UpdateNotification.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.UpdateNotification.Click += new System.EventHandler(this.UpdateNotification_Click);
-            // 
-            // MainFormContextMenu
-            // 
-            this.MainFormContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.MainStatusBar.Location = new System.Drawing.Point(0, 386);
+			this.MainStatusBar.Name = "MainStatusBar";
+			this.MainStatusBar.ShowItemToolTips = true;
+			this.MainStatusBar.Size = new System.Drawing.Size(470, 22);
+			this.MainStatusBar.SizingGrip = false;
+			this.MainStatusBar.TabIndex = 1;
+			this.MainStatusBar.Text = "0";
+			// 
+			// DumpStatusButton
+			// 
+			this.DumpStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.DumpStatusButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank;
+			this.DumpStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.DumpStatusButton.Name = "DumpStatusButton";
+			this.DumpStatusButton.ShowDropDownArrow = false;
+			this.DumpStatusButton.Size = new System.Drawing.Size(20, 20);
+			this.DumpStatusButton.Text = "No ROM loaded";
+			this.DumpStatusButton.Click += new System.EventHandler(this.DumpStatusButton_Click);
+			// 
+			// EmuStatus
+			// 
+			this.EmuStatus.Name = "EmuStatus";
+			this.EmuStatus.Size = new System.Drawing.Size(0, 17);
+			// 
+			// PlayRecordStatusButton
+			// 
+			this.PlayRecordStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.PlayRecordStatusButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank;
+			this.PlayRecordStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.PlayRecordStatusButton.Name = "PlayRecordStatusButton";
+			this.PlayRecordStatusButton.ShowDropDownArrow = false;
+			this.PlayRecordStatusButton.Size = new System.Drawing.Size(20, 20);
+			this.PlayRecordStatusButton.Text = "No movie is active";
+			// 
+			// PauseStatusButton
+			// 
+			this.PauseStatusButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+			this.PauseStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.PauseStatusButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank;
+			this.PauseStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.PauseStatusButton.Name = "PauseStatusButton";
+			this.PauseStatusButton.ShowDropDownArrow = false;
+			this.PauseStatusButton.Size = new System.Drawing.Size(20, 20);
+			this.PauseStatusButton.Text = "toolStripDropDownButton1";
+			this.PauseStatusButton.ToolTipText = "Emulator is paused";
+			this.PauseStatusButton.Click += new System.EventHandler(this.PauseMenuItem_Click);
+			// 
+			// RebootStatusBarIcon
+			// 
+			this.RebootStatusBarIcon.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.RebootStatusBarIcon.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot;
+			this.RebootStatusBarIcon.Name = "RebootStatusBarIcon";
+			this.RebootStatusBarIcon.RightToLeft = System.Windows.Forms.RightToLeft.No;
+			this.RebootStatusBarIcon.Size = new System.Drawing.Size(16, 17);
+			this.RebootStatusBarIcon.Text = "Reboot";
+			this.RebootStatusBarIcon.ToolTipText = "A reboot of the core is needed for a setting change to take affect";
+			this.RebootStatusBarIcon.Click += new System.EventHandler(this.PowerMenuItem_Click);
+			// 
+			// AVIStatusLabel
+			// 
+			this.AVIStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.AVIStatusLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Blank;
+			this.AVIStatusLabel.Name = "AVIStatusLabel";
+			this.AVIStatusLabel.Size = new System.Drawing.Size(16, 17);
+			this.AVIStatusLabel.Text = "AVI Capture";
+			// 
+			// LedLightStatusLabel
+			// 
+			this.LedLightStatusLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LightOff;
+			this.LedLightStatusLabel.Name = "LedLightStatusLabel";
+			this.LedLightStatusLabel.Size = new System.Drawing.Size(16, 17);
+			this.LedLightStatusLabel.ToolTipText = "Disk Drive LED Light";
+			// 
+			// SaveSlotsStatusLabel
+			// 
+			this.SaveSlotsStatusLabel.BackColor = System.Drawing.SystemColors.Control;
+			this.SaveSlotsStatusLabel.Name = "SaveSlotsStatusLabel";
+			this.SaveSlotsStatusLabel.Size = new System.Drawing.Size(56, 17);
+			this.SaveSlotsStatusLabel.Text = "Save slots";
+			// 
+			// Slot1StatusButton
+			// 
+			this.Slot1StatusButton.Name = "Slot1StatusButton";
+			this.Slot1StatusButton.Size = new System.Drawing.Size(13, 17);
+			this.Slot1StatusButton.Text = "1";
+			this.Slot1StatusButton.ToolTipText = "Save slot 1";
+			this.Slot1StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
+			// 
+			// Slot2StatusButton
+			// 
+			this.Slot2StatusButton.Name = "Slot2StatusButton";
+			this.Slot2StatusButton.Size = new System.Drawing.Size(13, 17);
+			this.Slot2StatusButton.Text = "2";
+			this.Slot2StatusButton.ToolTipText = "Save slot 2";
+			this.Slot2StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
+			// 
+			// Slot3StatusButton
+			// 
+			this.Slot3StatusButton.Name = "Slot3StatusButton";
+			this.Slot3StatusButton.Size = new System.Drawing.Size(13, 17);
+			this.Slot3StatusButton.Text = "3";
+			this.Slot3StatusButton.ToolTipText = "Save slot 3";
+			this.Slot3StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
+			// 
+			// Slot4StatusButton
+			// 
+			this.Slot4StatusButton.Name = "Slot4StatusButton";
+			this.Slot4StatusButton.Size = new System.Drawing.Size(13, 17);
+			this.Slot4StatusButton.Text = "4";
+			this.Slot4StatusButton.ToolTipText = "Save slot 4";
+			this.Slot4StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
+			// 
+			// Slot5StatusButton
+			// 
+			this.Slot5StatusButton.Name = "Slot5StatusButton";
+			this.Slot5StatusButton.Size = new System.Drawing.Size(13, 17);
+			this.Slot5StatusButton.Text = "5";
+			this.Slot5StatusButton.ToolTipText = "Save slot 5";
+			this.Slot5StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
+			// 
+			// Slot6StatusButton
+			// 
+			this.Slot6StatusButton.Name = "Slot6StatusButton";
+			this.Slot6StatusButton.Size = new System.Drawing.Size(13, 17);
+			this.Slot6StatusButton.Text = "6";
+			this.Slot6StatusButton.ToolTipText = "Save slot 6";
+			this.Slot6StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
+			// 
+			// Slot7StatusButton
+			// 
+			this.Slot7StatusButton.Name = "Slot7StatusButton";
+			this.Slot7StatusButton.Size = new System.Drawing.Size(13, 17);
+			this.Slot7StatusButton.Text = "7";
+			this.Slot7StatusButton.ToolTipText = "Save slot 7";
+			this.Slot7StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
+			// 
+			// Slot8StatusButton
+			// 
+			this.Slot8StatusButton.Name = "Slot8StatusButton";
+			this.Slot8StatusButton.Size = new System.Drawing.Size(13, 17);
+			this.Slot8StatusButton.Text = "8";
+			this.Slot8StatusButton.ToolTipText = "Save slot 8";
+			this.Slot8StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
+			// 
+			// Slot9StatusButton
+			// 
+			this.Slot9StatusButton.Name = "Slot9StatusButton";
+			this.Slot9StatusButton.Size = new System.Drawing.Size(13, 17);
+			this.Slot9StatusButton.Text = "9";
+			this.Slot9StatusButton.ToolTipText = "Save slot 9";
+			this.Slot9StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
+			// 
+			// Slot0StatusButton
+			// 
+			this.Slot0StatusButton.Name = "Slot0StatusButton";
+			this.Slot0StatusButton.Size = new System.Drawing.Size(13, 17);
+			this.Slot0StatusButton.Text = "0";
+			this.Slot0StatusButton.ToolTipText = "Save slot 0";
+			this.Slot0StatusButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.SlotStatusButtons_MouseUp);
+			// 
+			// CheatStatusButton
+			// 
+			this.CheatStatusButton.Name = "CheatStatusButton";
+			this.CheatStatusButton.Size = new System.Drawing.Size(0, 17);
+			this.CheatStatusButton.Click += new System.EventHandler(this.FreezeStatus_Click);
+			// 
+			// KeyPriorityStatusLabel
+			// 
+			this.KeyPriorityStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.KeyPriorityStatusLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Both;
+			this.KeyPriorityStatusLabel.Margin = new System.Windows.Forms.Padding(5, 3, 5, 0);
+			this.KeyPriorityStatusLabel.Name = "KeyPriorityStatusLabel";
+			this.KeyPriorityStatusLabel.Size = new System.Drawing.Size(16, 19);
+			this.KeyPriorityStatusLabel.Text = "KeyPriority";
+			this.KeyPriorityStatusLabel.Click += new System.EventHandler(this.KeyPriorityStatusLabel_Click);
+			// 
+			// CoreNameStatusBarButton
+			// 
+			this.CoreNameStatusBarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall;
+			this.CoreNameStatusBarButton.Name = "CoreNameStatusBarButton";
+			this.CoreNameStatusBarButton.Size = new System.Drawing.Size(66, 17);
+			this.CoreNameStatusBarButton.Text = "Neshawk";
+			// 
+			// ProfileFirstBootLabel
+			// 
+			this.ProfileFirstBootLabel.AutoToolTip = true;
+			this.ProfileFirstBootLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.ProfileFirstBootLabel.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.user_blue_small;
+			this.ProfileFirstBootLabel.Name = "ProfileFirstBootLabel";
+			this.ProfileFirstBootLabel.Size = new System.Drawing.Size(16, 17);
+			this.ProfileFirstBootLabel.Text = "ProfileFirstBootLabel";
+			this.ProfileFirstBootLabel.ToolTipText = "Set up your profile before use";
+			this.ProfileFirstBootLabel.Visible = false;
+			this.ProfileFirstBootLabel.Click += new System.EventHandler(this.ProfileFirstBootLabel_Click);
+			// 
+			// LinkConnectStatusBarButton
+			// 
+			this.LinkConnectStatusBarButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.LinkConnectStatusBarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.connect_16x16;
+			this.LinkConnectStatusBarButton.Name = "LinkConnectStatusBarButton";
+			this.LinkConnectStatusBarButton.Size = new System.Drawing.Size(16, 17);
+			this.LinkConnectStatusBarButton.Text = "Link connection is currently enabled";
+			this.LinkConnectStatusBarButton.ToolTipText = "Link connection is currently enabled";
+			this.LinkConnectStatusBarButton.Click += new System.EventHandler(this.LinkConnectStatusBarButton_Click);
+			// 
+			// UpdateNotification
+			// 
+			this.UpdateNotification.IsLink = true;
+			this.UpdateNotification.LinkColor = System.Drawing.Color.Red;
+			this.UpdateNotification.Name = "UpdateNotification";
+			this.UpdateNotification.Size = new System.Drawing.Size(53, 17);
+			this.UpdateNotification.Spring = true;
+			this.UpdateNotification.Text = "New version available!";
+			this.UpdateNotification.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			this.UpdateNotification.Click += new System.EventHandler(this.UpdateNotification_Click);
+			// 
+			// MainFormContextMenu
+			// 
+			this.MainFormContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.OpenRomContextMenuItem,
             this.LoadLastRomContextMenuItem,
             this.StopAVContextMenuItem,
@@ -3215,145 +3224,145 @@
             this.ClearSRAMContextMenuItem,
             this.ShowMenuContextMenuSeparator,
             this.ShowMenuContextMenuItem});
-            this.MainFormContextMenu.Name = "contextMenuStrip1";
-            this.MainFormContextMenu.Size = new System.Drawing.Size(217, 468);
-            this.MainFormContextMenu.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.MainFormContextMenu_Closing);
-            this.MainFormContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.MainFormContextMenu_Opening);
-            // 
-            // OpenRomContextMenuItem
-            // 
-            this.OpenRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
-            this.OpenRomContextMenuItem.Name = "OpenRomContextMenuItem";
-            this.OpenRomContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.OpenRomContextMenuItem.Text = "Open Rom";
-            this.OpenRomContextMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click);
-            // 
-            // LoadLastRomContextMenuItem
-            // 
-            this.LoadLastRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
-            this.LoadLastRomContextMenuItem.Name = "LoadLastRomContextMenuItem";
-            this.LoadLastRomContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.LoadLastRomContextMenuItem.Text = "Load Last ROM";
-            this.LoadLastRomContextMenuItem.Click += new System.EventHandler(this.LoadLastRomContextMenuItem_Click);
-            // 
-            // StopAVContextMenuItem
-            // 
-            this.StopAVContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
-            this.StopAVContextMenuItem.Name = "StopAVContextMenuItem";
-            this.StopAVContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.StopAVContextMenuItem.Text = "Stop AVI/WAV";
-            this.StopAVContextMenuItem.Click += new System.EventHandler(this.StopAVMenuItem_Click);
-            // 
-            // ContextSeparator_AfterROM
-            // 
-            this.ContextSeparator_AfterROM.Name = "ContextSeparator_AfterROM";
-            this.ContextSeparator_AfterROM.Size = new System.Drawing.Size(213, 6);
-            // 
-            // RecordMovieContextMenuItem
-            // 
-            this.RecordMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS;
-            this.RecordMovieContextMenuItem.Name = "RecordMovieContextMenuItem";
-            this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.RecordMovieContextMenuItem.Text = "Record Movie";
-            this.RecordMovieContextMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click);
-            // 
-            // PlayMovieContextMenuItem
-            // 
-            this.PlayMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play;
-            this.PlayMovieContextMenuItem.Name = "PlayMovieContextMenuItem";
-            this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.PlayMovieContextMenuItem.Text = "Play Movie";
-            this.PlayMovieContextMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click);
-            // 
-            // RestartMovieContextMenuItem
-            // 
-            this.RestartMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart;
-            this.RestartMovieContextMenuItem.Name = "RestartMovieContextMenuItem";
-            this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.RestartMovieContextMenuItem.Text = "Restart Movie";
-            this.RestartMovieContextMenuItem.Click += new System.EventHandler(this.PlayFromBeginningMenuItem_Click);
-            // 
-            // StopMovieContextMenuItem
-            // 
-            this.StopMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
-            this.StopMovieContextMenuItem.Name = "StopMovieContextMenuItem";
-            this.StopMovieContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.StopMovieContextMenuItem.Text = "Stop Movie";
-            this.StopMovieContextMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click);
-            // 
-            // LoadLastMovieContextMenuItem
-            // 
-            this.LoadLastMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
-            this.LoadLastMovieContextMenuItem.Name = "LoadLastMovieContextMenuItem";
-            this.LoadLastMovieContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.LoadLastMovieContextMenuItem.Text = "Load Last Movie";
-            this.LoadLastMovieContextMenuItem.Click += new System.EventHandler(this.LoadLastMovieContextMenuItem_Click);
-            // 
-            // BackupMovieContextMenuItem
-            // 
-            this.BackupMovieContextMenuItem.Name = "BackupMovieContextMenuItem";
-            this.BackupMovieContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.BackupMovieContextMenuItem.Text = "Backup Movie";
-            this.BackupMovieContextMenuItem.Click += new System.EventHandler(this.BackupMovieContextMenuItem_Click);
-            // 
-            // StopNoSaveContextMenuItem
-            // 
-            this.StopNoSaveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
-            this.StopNoSaveContextMenuItem.Name = "StopNoSaveContextMenuItem";
-            this.StopNoSaveContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.StopNoSaveContextMenuItem.Text = "Stop Movie without Saving";
-            this.StopNoSaveContextMenuItem.Click += new System.EventHandler(this.StopMovieWithoutSavingMenuItem_Click);
-            // 
-            // ViewSubtitlesContextMenuItem
-            // 
-            this.ViewSubtitlesContextMenuItem.Name = "ViewSubtitlesContextMenuItem";
-            this.ViewSubtitlesContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.ViewSubtitlesContextMenuItem.Text = "View Subtitles";
-            this.ViewSubtitlesContextMenuItem.Click += new System.EventHandler(this.ViewSubtitlesContextMenuItem_Click);
-            // 
-            // AddSubtitleContextMenuItem
-            // 
-            this.AddSubtitleContextMenuItem.Name = "AddSubtitleContextMenuItem";
-            this.AddSubtitleContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.AddSubtitleContextMenuItem.Text = "Add Subtitle";
-            this.AddSubtitleContextMenuItem.Click += new System.EventHandler(this.AddSubtitleContextMenuItem_Click);
-            // 
-            // ViewCommentsContextMenuItem
-            // 
-            this.ViewCommentsContextMenuItem.Name = "ViewCommentsContextMenuItem";
-            this.ViewCommentsContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.ViewCommentsContextMenuItem.Text = "View Comments";
-            this.ViewCommentsContextMenuItem.Click += new System.EventHandler(this.ViewCommentsContextMenuItem_Click);
-            // 
-            // SaveMovieContextMenuItem
-            // 
-            this.SaveMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
-            this.SaveMovieContextMenuItem.Name = "SaveMovieContextMenuItem";
-            this.SaveMovieContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.SaveMovieContextMenuItem.Text = "Save Movie";
-            this.SaveMovieContextMenuItem.Click += new System.EventHandler(this.SaveMovieMenuItem_Click);
-            // 
-            // ContextSeparator_AfterMovie
-            // 
-            this.ContextSeparator_AfterMovie.Name = "ContextSeparator_AfterMovie";
-            this.ContextSeparator_AfterMovie.Size = new System.Drawing.Size(213, 6);
-            // 
-            // UndoSavestateContextMenuItem
-            // 
-            this.UndoSavestateContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo;
-            this.UndoSavestateContextMenuItem.Name = "UndoSavestateContextMenuItem";
-            this.UndoSavestateContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.UndoSavestateContextMenuItem.Text = "Undo Savestate";
-            this.UndoSavestateContextMenuItem.Click += new System.EventHandler(this.UndoSavestateContextMenuItem_Click);
-            // 
-            // ContextSeparator_AfterUndo
-            // 
-            this.ContextSeparator_AfterUndo.Name = "ContextSeparator_AfterUndo";
-            this.ContextSeparator_AfterUndo.Size = new System.Drawing.Size(213, 6);
-            // 
-            // ConfigContextMenuItem
-            // 
-            this.ConfigContextMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.MainFormContextMenu.Name = "contextMenuStrip1";
+			this.MainFormContextMenu.Size = new System.Drawing.Size(202, 468);
+			this.MainFormContextMenu.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.MainFormContextMenu_Closing);
+			this.MainFormContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.MainFormContextMenu_Opening);
+			// 
+			// OpenRomContextMenuItem
+			// 
+			this.OpenRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
+			this.OpenRomContextMenuItem.Name = "OpenRomContextMenuItem";
+			this.OpenRomContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.OpenRomContextMenuItem.Text = "Open Rom";
+			this.OpenRomContextMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click);
+			// 
+			// LoadLastRomContextMenuItem
+			// 
+			this.LoadLastRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
+			this.LoadLastRomContextMenuItem.Name = "LoadLastRomContextMenuItem";
+			this.LoadLastRomContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.LoadLastRomContextMenuItem.Text = "Load Last ROM";
+			this.LoadLastRomContextMenuItem.Click += new System.EventHandler(this.LoadLastRomContextMenuItem_Click);
+			// 
+			// StopAVContextMenuItem
+			// 
+			this.StopAVContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
+			this.StopAVContextMenuItem.Name = "StopAVContextMenuItem";
+			this.StopAVContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.StopAVContextMenuItem.Text = "Stop AVI/WAV";
+			this.StopAVContextMenuItem.Click += new System.EventHandler(this.StopAVMenuItem_Click);
+			// 
+			// ContextSeparator_AfterROM
+			// 
+			this.ContextSeparator_AfterROM.Name = "ContextSeparator_AfterROM";
+			this.ContextSeparator_AfterROM.Size = new System.Drawing.Size(198, 6);
+			// 
+			// RecordMovieContextMenuItem
+			// 
+			this.RecordMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS;
+			this.RecordMovieContextMenuItem.Name = "RecordMovieContextMenuItem";
+			this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.RecordMovieContextMenuItem.Text = "Record Movie";
+			this.RecordMovieContextMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click);
+			// 
+			// PlayMovieContextMenuItem
+			// 
+			this.PlayMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play;
+			this.PlayMovieContextMenuItem.Name = "PlayMovieContextMenuItem";
+			this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.PlayMovieContextMenuItem.Text = "Play Movie";
+			this.PlayMovieContextMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click);
+			// 
+			// RestartMovieContextMenuItem
+			// 
+			this.RestartMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart;
+			this.RestartMovieContextMenuItem.Name = "RestartMovieContextMenuItem";
+			this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.RestartMovieContextMenuItem.Text = "Restart Movie";
+			this.RestartMovieContextMenuItem.Click += new System.EventHandler(this.PlayFromBeginningMenuItem_Click);
+			// 
+			// StopMovieContextMenuItem
+			// 
+			this.StopMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
+			this.StopMovieContextMenuItem.Name = "StopMovieContextMenuItem";
+			this.StopMovieContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.StopMovieContextMenuItem.Text = "Stop Movie";
+			this.StopMovieContextMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click);
+			// 
+			// LoadLastMovieContextMenuItem
+			// 
+			this.LoadLastMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
+			this.LoadLastMovieContextMenuItem.Name = "LoadLastMovieContextMenuItem";
+			this.LoadLastMovieContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.LoadLastMovieContextMenuItem.Text = "Load Last Movie";
+			this.LoadLastMovieContextMenuItem.Click += new System.EventHandler(this.LoadLastMovieContextMenuItem_Click);
+			// 
+			// BackupMovieContextMenuItem
+			// 
+			this.BackupMovieContextMenuItem.Name = "BackupMovieContextMenuItem";
+			this.BackupMovieContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.BackupMovieContextMenuItem.Text = "Backup Movie";
+			this.BackupMovieContextMenuItem.Click += new System.EventHandler(this.BackupMovieContextMenuItem_Click);
+			// 
+			// StopNoSaveContextMenuItem
+			// 
+			this.StopNoSaveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
+			this.StopNoSaveContextMenuItem.Name = "StopNoSaveContextMenuItem";
+			this.StopNoSaveContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.StopNoSaveContextMenuItem.Text = "Stop Movie without Saving";
+			this.StopNoSaveContextMenuItem.Click += new System.EventHandler(this.StopMovieWithoutSavingMenuItem_Click);
+			// 
+			// ViewSubtitlesContextMenuItem
+			// 
+			this.ViewSubtitlesContextMenuItem.Name = "ViewSubtitlesContextMenuItem";
+			this.ViewSubtitlesContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.ViewSubtitlesContextMenuItem.Text = "View Subtitles";
+			this.ViewSubtitlesContextMenuItem.Click += new System.EventHandler(this.ViewSubtitlesContextMenuItem_Click);
+			// 
+			// AddSubtitleContextMenuItem
+			// 
+			this.AddSubtitleContextMenuItem.Name = "AddSubtitleContextMenuItem";
+			this.AddSubtitleContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.AddSubtitleContextMenuItem.Text = "Add Subtitle";
+			this.AddSubtitleContextMenuItem.Click += new System.EventHandler(this.AddSubtitleContextMenuItem_Click);
+			// 
+			// ViewCommentsContextMenuItem
+			// 
+			this.ViewCommentsContextMenuItem.Name = "ViewCommentsContextMenuItem";
+			this.ViewCommentsContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.ViewCommentsContextMenuItem.Text = "View Comments";
+			this.ViewCommentsContextMenuItem.Click += new System.EventHandler(this.ViewCommentsContextMenuItem_Click);
+			// 
+			// SaveMovieContextMenuItem
+			// 
+			this.SaveMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
+			this.SaveMovieContextMenuItem.Name = "SaveMovieContextMenuItem";
+			this.SaveMovieContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.SaveMovieContextMenuItem.Text = "Save Movie";
+			this.SaveMovieContextMenuItem.Click += new System.EventHandler(this.SaveMovieMenuItem_Click);
+			// 
+			// ContextSeparator_AfterMovie
+			// 
+			this.ContextSeparator_AfterMovie.Name = "ContextSeparator_AfterMovie";
+			this.ContextSeparator_AfterMovie.Size = new System.Drawing.Size(198, 6);
+			// 
+			// UndoSavestateContextMenuItem
+			// 
+			this.UndoSavestateContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo;
+			this.UndoSavestateContextMenuItem.Name = "UndoSavestateContextMenuItem";
+			this.UndoSavestateContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.UndoSavestateContextMenuItem.Text = "Undo Savestate";
+			this.UndoSavestateContextMenuItem.Click += new System.EventHandler(this.UndoSavestateContextMenuItem_Click);
+			// 
+			// ContextSeparator_AfterUndo
+			// 
+			this.ContextSeparator_AfterUndo.Name = "ContextSeparator_AfterUndo";
+			this.ContextSeparator_AfterUndo.Size = new System.Drawing.Size(198, 6);
+			// 
+			// ConfigContextMenuItem
+			// 
+			this.ConfigContextMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripMenuItem6,
             this.toolStripMenuItem7,
             this.toolStripMenuItem8,
@@ -3371,237 +3380,237 @@
             this.toolStripSeparator37,
             this.toolStripMenuItem66,
             this.toolStripMenuItem67});
-            this.ConfigContextMenuItem.Name = "ConfigContextMenuItem";
-            this.ConfigContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.ConfigContextMenuItem.Text = "Config";
-            // 
-            // toolStripMenuItem6
-            // 
-            this.toolStripMenuItem6.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
-            this.toolStripMenuItem6.Name = "toolStripMenuItem6";
-            this.toolStripMenuItem6.Size = new System.Drawing.Size(159, 22);
-            this.toolStripMenuItem6.Text = "&Controllers...";
-            this.toolStripMenuItem6.Click += new System.EventHandler(this.ControllersMenuItem_Click);
-            // 
-            // toolStripMenuItem7
-            // 
-            this.toolStripMenuItem7.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys;
-            this.toolStripMenuItem7.Name = "toolStripMenuItem7";
-            this.toolStripMenuItem7.Size = new System.Drawing.Size(159, 22);
-            this.toolStripMenuItem7.Text = "&Hotkeys...";
-            this.toolStripMenuItem7.Click += new System.EventHandler(this.HotkeysMenuItem_Click);
-            // 
-            // toolStripMenuItem8
-            // 
-            this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image")));
-            this.toolStripMenuItem8.Name = "toolStripMenuItem8";
-            this.toolStripMenuItem8.Size = new System.Drawing.Size(159, 22);
-            this.toolStripMenuItem8.Text = "Display...";
-            this.toolStripMenuItem8.Click += new System.EventHandler(this.DisplayConfigMenuItem_Click);
-            // 
-            // toolStripMenuItem9
-            // 
-            this.toolStripMenuItem9.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS;
-            this.toolStripMenuItem9.Name = "toolStripMenuItem9";
-            this.toolStripMenuItem9.Size = new System.Drawing.Size(159, 22);
-            this.toolStripMenuItem9.Text = "&Sound...";
-            this.toolStripMenuItem9.Click += new System.EventHandler(this.SoundMenuItem_Click);
-            // 
-            // toolStripMenuItem10
-            // 
-            this.toolStripMenuItem10.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS;
-            this.toolStripMenuItem10.Name = "toolStripMenuItem10";
-            this.toolStripMenuItem10.Size = new System.Drawing.Size(159, 22);
-            this.toolStripMenuItem10.Text = "Paths...";
-            this.toolStripMenuItem10.Click += new System.EventHandler(this.PathsMenuItem_Click);
-            // 
-            // toolStripMenuItem11
-            // 
-            this.toolStripMenuItem11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem11.Image")));
-            this.toolStripMenuItem11.Name = "toolStripMenuItem11";
-            this.toolStripMenuItem11.Size = new System.Drawing.Size(159, 22);
-            this.toolStripMenuItem11.Text = "&Firmwares...";
-            this.toolStripMenuItem11.Click += new System.EventHandler(this.FirmwaresMenuItem_Click);
-            // 
-            // toolStripMenuItem12
-            // 
-            this.toolStripMenuItem12.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig;
-            this.toolStripMenuItem12.Name = "toolStripMenuItem12";
-            this.toolStripMenuItem12.Size = new System.Drawing.Size(159, 22);
-            this.toolStripMenuItem12.Text = "&Messages...";
-            this.toolStripMenuItem12.Click += new System.EventHandler(this.MessagesMenuItem_Click);
-            // 
-            // toolStripMenuItem13
-            // 
-            this.toolStripMenuItem13.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning;
-            this.toolStripMenuItem13.Name = "toolStripMenuItem13";
-            this.toolStripMenuItem13.Size = new System.Drawing.Size(159, 22);
-            this.toolStripMenuItem13.Text = "&Autofire...";
-            // 
-            // toolStripMenuItem14
-            // 
-            this.toolStripMenuItem14.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous;
-            this.toolStripMenuItem14.Name = "toolStripMenuItem14";
-            this.toolStripMenuItem14.Size = new System.Drawing.Size(159, 22);
-            this.toolStripMenuItem14.Text = "&Rewind...";
-            this.toolStripMenuItem14.Click += new System.EventHandler(this.RewindOptionsMenuItem_Click);
-            // 
-            // toolStripMenuItem15
-            // 
-            this.toolStripMenuItem15.Name = "toolStripMenuItem15";
-            this.toolStripMenuItem15.Size = new System.Drawing.Size(159, 22);
-            this.toolStripMenuItem15.Text = "File Extensions...";
-            this.toolStripMenuItem15.Click += new System.EventHandler(this.FileExtensionsMenuItem_Click);
-            // 
-            // customizeToolStripMenuItem
-            // 
-            this.customizeToolStripMenuItem.Name = "customizeToolStripMenuItem";
-            this.customizeToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
-            this.customizeToolStripMenuItem.Text = "Customize...";
-            this.customizeToolStripMenuItem.Click += new System.EventHandler(this.CustomizeMenuItem_Click);
-            // 
-            // toolStripSeparator30
-            // 
-            this.toolStripSeparator30.Name = "toolStripSeparator30";
-            this.toolStripSeparator30.Size = new System.Drawing.Size(156, 6);
-            // 
-            // SavestateTypeContextSubMenu
-            // 
-            this.SavestateTypeContextSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.ConfigContextMenuItem.Name = "ConfigContextMenuItem";
+			this.ConfigContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.ConfigContextMenuItem.Text = "Config";
+			// 
+			// toolStripMenuItem6
+			// 
+			this.toolStripMenuItem6.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
+			this.toolStripMenuItem6.Name = "toolStripMenuItem6";
+			this.toolStripMenuItem6.Size = new System.Drawing.Size(157, 22);
+			this.toolStripMenuItem6.Text = "&Controllers...";
+			this.toolStripMenuItem6.Click += new System.EventHandler(this.ControllersMenuItem_Click);
+			// 
+			// toolStripMenuItem7
+			// 
+			this.toolStripMenuItem7.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys;
+			this.toolStripMenuItem7.Name = "toolStripMenuItem7";
+			this.toolStripMenuItem7.Size = new System.Drawing.Size(157, 22);
+			this.toolStripMenuItem7.Text = "&Hotkeys...";
+			this.toolStripMenuItem7.Click += new System.EventHandler(this.HotkeysMenuItem_Click);
+			// 
+			// toolStripMenuItem8
+			// 
+			this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image")));
+			this.toolStripMenuItem8.Name = "toolStripMenuItem8";
+			this.toolStripMenuItem8.Size = new System.Drawing.Size(157, 22);
+			this.toolStripMenuItem8.Text = "Display...";
+			this.toolStripMenuItem8.Click += new System.EventHandler(this.DisplayConfigMenuItem_Click);
+			// 
+			// toolStripMenuItem9
+			// 
+			this.toolStripMenuItem9.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS;
+			this.toolStripMenuItem9.Name = "toolStripMenuItem9";
+			this.toolStripMenuItem9.Size = new System.Drawing.Size(157, 22);
+			this.toolStripMenuItem9.Text = "&Sound...";
+			this.toolStripMenuItem9.Click += new System.EventHandler(this.SoundMenuItem_Click);
+			// 
+			// toolStripMenuItem10
+			// 
+			this.toolStripMenuItem10.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS;
+			this.toolStripMenuItem10.Name = "toolStripMenuItem10";
+			this.toolStripMenuItem10.Size = new System.Drawing.Size(157, 22);
+			this.toolStripMenuItem10.Text = "Paths...";
+			this.toolStripMenuItem10.Click += new System.EventHandler(this.PathsMenuItem_Click);
+			// 
+			// toolStripMenuItem11
+			// 
+			this.toolStripMenuItem11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem11.Image")));
+			this.toolStripMenuItem11.Name = "toolStripMenuItem11";
+			this.toolStripMenuItem11.Size = new System.Drawing.Size(157, 22);
+			this.toolStripMenuItem11.Text = "&Firmwares...";
+			this.toolStripMenuItem11.Click += new System.EventHandler(this.FirmwaresMenuItem_Click);
+			// 
+			// toolStripMenuItem12
+			// 
+			this.toolStripMenuItem12.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig;
+			this.toolStripMenuItem12.Name = "toolStripMenuItem12";
+			this.toolStripMenuItem12.Size = new System.Drawing.Size(157, 22);
+			this.toolStripMenuItem12.Text = "&Messages...";
+			this.toolStripMenuItem12.Click += new System.EventHandler(this.MessagesMenuItem_Click);
+			// 
+			// toolStripMenuItem13
+			// 
+			this.toolStripMenuItem13.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning;
+			this.toolStripMenuItem13.Name = "toolStripMenuItem13";
+			this.toolStripMenuItem13.Size = new System.Drawing.Size(157, 22);
+			this.toolStripMenuItem13.Text = "&Autofire...";
+			// 
+			// toolStripMenuItem14
+			// 
+			this.toolStripMenuItem14.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous;
+			this.toolStripMenuItem14.Name = "toolStripMenuItem14";
+			this.toolStripMenuItem14.Size = new System.Drawing.Size(157, 22);
+			this.toolStripMenuItem14.Text = "&Rewind...";
+			this.toolStripMenuItem14.Click += new System.EventHandler(this.RewindOptionsMenuItem_Click);
+			// 
+			// toolStripMenuItem15
+			// 
+			this.toolStripMenuItem15.Name = "toolStripMenuItem15";
+			this.toolStripMenuItem15.Size = new System.Drawing.Size(157, 22);
+			this.toolStripMenuItem15.Text = "File Extensions...";
+			this.toolStripMenuItem15.Click += new System.EventHandler(this.FileExtensionsMenuItem_Click);
+			// 
+			// customizeToolStripMenuItem
+			// 
+			this.customizeToolStripMenuItem.Name = "customizeToolStripMenuItem";
+			this.customizeToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.customizeToolStripMenuItem.Text = "Customize...";
+			this.customizeToolStripMenuItem.Click += new System.EventHandler(this.CustomizeMenuItem_Click);
+			// 
+			// toolStripSeparator30
+			// 
+			this.toolStripSeparator30.Name = "toolStripSeparator30";
+			this.toolStripSeparator30.Size = new System.Drawing.Size(154, 6);
+			// 
+			// SavestateTypeContextSubMenu
+			// 
+			this.SavestateTypeContextSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.SavestateTypeDefaultContextMenuItem,
             this.SavestateBinaryContextMenuItem,
             this.SavestateTextContextMenuItem});
-            this.SavestateTypeContextSubMenu.Name = "SavestateTypeContextSubMenu";
-            this.SavestateTypeContextSubMenu.Size = new System.Drawing.Size(159, 22);
-            this.SavestateTypeContextSubMenu.Text = "Savestate Type";
-            this.SavestateTypeContextSubMenu.DropDownOpened += new System.EventHandler(this.SavestateTypeContextSubMenu_DropDownOpened);
-            // 
-            // SavestateTypeDefaultContextMenuItem
-            // 
-            this.SavestateTypeDefaultContextMenuItem.Name = "SavestateTypeDefaultContextMenuItem";
-            this.SavestateTypeDefaultContextMenuItem.Size = new System.Drawing.Size(67, 22);
-            // 
-            // SavestateBinaryContextMenuItem
-            // 
-            this.SavestateBinaryContextMenuItem.Name = "SavestateBinaryContextMenuItem";
-            this.SavestateBinaryContextMenuItem.Size = new System.Drawing.Size(67, 22);
-            // 
-            // SavestateTextContextMenuItem
-            // 
-            this.SavestateTextContextMenuItem.Name = "SavestateTextContextMenuItem";
-            this.SavestateTextContextMenuItem.Size = new System.Drawing.Size(67, 22);
-            // 
-            // CoreSelectionContextSubMenu
-            // 
-            this.CoreSelectionContextSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.SavestateTypeContextSubMenu.Name = "SavestateTypeContextSubMenu";
+			this.SavestateTypeContextSubMenu.Size = new System.Drawing.Size(157, 22);
+			this.SavestateTypeContextSubMenu.Text = "Savestate Type";
+			this.SavestateTypeContextSubMenu.DropDownOpened += new System.EventHandler(this.SavestateTypeContextSubMenu_DropDownOpened);
+			// 
+			// SavestateTypeDefaultContextMenuItem
+			// 
+			this.SavestateTypeDefaultContextMenuItem.Name = "SavestateTypeDefaultContextMenuItem";
+			this.SavestateTypeDefaultContextMenuItem.Size = new System.Drawing.Size(67, 22);
+			// 
+			// SavestateBinaryContextMenuItem
+			// 
+			this.SavestateBinaryContextMenuItem.Name = "SavestateBinaryContextMenuItem";
+			this.SavestateBinaryContextMenuItem.Size = new System.Drawing.Size(67, 22);
+			// 
+			// SavestateTextContextMenuItem
+			// 
+			this.SavestateTextContextMenuItem.Name = "SavestateTextContextMenuItem";
+			this.SavestateTextContextMenuItem.Size = new System.Drawing.Size(67, 22);
+			// 
+			// CoreSelectionContextSubMenu
+			// 
+			this.CoreSelectionContextSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.GBInSGBContextMenuItem,
             this.NesInQuickNESContextMenuItem});
-            this.CoreSelectionContextSubMenu.Name = "CoreSelectionContextSubMenu";
-            this.CoreSelectionContextSubMenu.Size = new System.Drawing.Size(159, 22);
-            this.CoreSelectionContextSubMenu.Text = "Core Selection";
-            this.CoreSelectionContextSubMenu.DropDownOpened += new System.EventHandler(this.CoreSelectionContextSubMenu_DropDownOpened);
-            // 
-            // GBInSGBContextMenuItem
-            // 
-            this.GBInSGBContextMenuItem.Name = "GBInSGBContextMenuItem";
-            this.GBInSGBContextMenuItem.Size = new System.Drawing.Size(163, 22);
-            this.GBInSGBContextMenuItem.Text = "GB in SGB";
-            this.GBInSGBContextMenuItem.Click += new System.EventHandler(this.GBInSGBMenuItem_Click);
-            // 
-            // NesInQuickNESContextMenuItem
-            // 
-            this.NesInQuickNESContextMenuItem.Name = "NesInQuickNESContextMenuItem";
-            this.NesInQuickNESContextMenuItem.Size = new System.Drawing.Size(163, 22);
-            this.NesInQuickNESContextMenuItem.Text = "NES in QuickNES";
-            this.NesInQuickNESContextMenuItem.Click += new System.EventHandler(this.NesInQuickNESMenuItem_Click);
-            // 
-            // toolStripSeparator37
-            // 
-            this.toolStripSeparator37.Name = "toolStripSeparator37";
-            this.toolStripSeparator37.Size = new System.Drawing.Size(156, 6);
-            // 
-            // toolStripMenuItem66
-            // 
-            this.toolStripMenuItem66.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save;
-            this.toolStripMenuItem66.Name = "toolStripMenuItem66";
-            this.toolStripMenuItem66.Size = new System.Drawing.Size(159, 22);
-            this.toolStripMenuItem66.Text = "Save Config";
-            this.toolStripMenuItem66.Click += new System.EventHandler(this.SaveConfigMenuItem_Click);
-            // 
-            // toolStripMenuItem67
-            // 
-            this.toolStripMenuItem67.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig;
-            this.toolStripMenuItem67.Name = "toolStripMenuItem67";
-            this.toolStripMenuItem67.Size = new System.Drawing.Size(159, 22);
-            this.toolStripMenuItem67.Text = "Load Config";
-            this.toolStripMenuItem67.Click += new System.EventHandler(this.LoadConfigMenuItem_Click);
-            // 
-            // ScreenshotContextMenuItem
-            // 
-            this.ScreenshotContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera;
-            this.ScreenshotContextMenuItem.Name = "ScreenshotContextMenuItem";
-            this.ScreenshotContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.ScreenshotContextMenuItem.Text = "Screenshot";
-            this.ScreenshotContextMenuItem.Click += new System.EventHandler(this.ScreenshotMenuItem_Click);
-            // 
-            // CloseRomContextMenuItem
-            // 
-            this.CloseRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close;
-            this.CloseRomContextMenuItem.Name = "CloseRomContextMenuItem";
-            this.CloseRomContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.CloseRomContextMenuItem.Text = "Close ROM";
-            this.CloseRomContextMenuItem.Click += new System.EventHandler(this.CloseRomMenuItem_Click);
-            // 
-            // ClearSRAMContextMenuItem
-            // 
-            this.ClearSRAMContextMenuItem.Name = "ClearSRAMContextMenuItem";
-            this.ClearSRAMContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.ClearSRAMContextMenuItem.Text = "Close and Clear SRAM";
-            this.ClearSRAMContextMenuItem.Click += new System.EventHandler(this.ClearSRAMContextMenuItem_Click);
-            // 
-            // ShowMenuContextMenuSeparator
-            // 
-            this.ShowMenuContextMenuSeparator.Name = "ShowMenuContextMenuSeparator";
-            this.ShowMenuContextMenuSeparator.Size = new System.Drawing.Size(213, 6);
-            // 
-            // ShowMenuContextMenuItem
-            // 
-            this.ShowMenuContextMenuItem.Name = "ShowMenuContextMenuItem";
-            this.ShowMenuContextMenuItem.Size = new System.Drawing.Size(216, 22);
-            this.ShowMenuContextMenuItem.Text = "Show Menu";
-            this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click);
-            // 
-            // timerMouseIdle
-            // 
-            this.timerMouseIdle.Enabled = true;
-            this.timerMouseIdle.Interval = 2000;
-            this.timerMouseIdle.Tick += new System.EventHandler(this.timerMouseIdle_Tick);
-            // 
-            // MainForm
-            // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
-            this.ClientSize = new System.Drawing.Size(470, 408);
-            this.Controls.Add(this.MainStatusBar);
-            this.Controls.Add(this.MainformMenu);
-            this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.MainMenuStrip = this.MainformMenu;
-            this.Name = "MainForm";
-            this.Text = "BizHawk";
-            this.Activated += new System.EventHandler(this.MainForm_Activated);
-            this.Deactivate += new System.EventHandler(this.MainForm_Deactivate);
-            this.Load += new System.EventHandler(this.MainForm_Load);
-            this.Shown += new System.EventHandler(this.MainForm_Shown);
-            this.Enter += new System.EventHandler(this.MainForm_Enter);
-            this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.MainForm_MouseClick);
-            this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.MainForm_MouseMove);
-            this.Resize += new System.EventHandler(this.MainForm_Resize);
-            this.MainformMenu.ResumeLayout(false);
-            this.MainformMenu.PerformLayout();
-            this.MainStatusBar.ResumeLayout(false);
-            this.MainStatusBar.PerformLayout();
-            this.MainFormContextMenu.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
+			this.CoreSelectionContextSubMenu.Name = "CoreSelectionContextSubMenu";
+			this.CoreSelectionContextSubMenu.Size = new System.Drawing.Size(157, 22);
+			this.CoreSelectionContextSubMenu.Text = "Core Selection";
+			this.CoreSelectionContextSubMenu.DropDownOpened += new System.EventHandler(this.CoreSelectionContextSubMenu_DropDownOpened);
+			// 
+			// GBInSGBContextMenuItem
+			// 
+			this.GBInSGBContextMenuItem.Name = "GBInSGBContextMenuItem";
+			this.GBInSGBContextMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.GBInSGBContextMenuItem.Text = "GB in SGB";
+			this.GBInSGBContextMenuItem.Click += new System.EventHandler(this.GBInSGBMenuItem_Click);
+			// 
+			// NesInQuickNESContextMenuItem
+			// 
+			this.NesInQuickNESContextMenuItem.Name = "NesInQuickNESContextMenuItem";
+			this.NesInQuickNESContextMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.NesInQuickNESContextMenuItem.Text = "NES in QuickNES";
+			this.NesInQuickNESContextMenuItem.Click += new System.EventHandler(this.NesInQuickNESMenuItem_Click);
+			// 
+			// toolStripSeparator37
+			// 
+			this.toolStripSeparator37.Name = "toolStripSeparator37";
+			this.toolStripSeparator37.Size = new System.Drawing.Size(154, 6);
+			// 
+			// toolStripMenuItem66
+			// 
+			this.toolStripMenuItem66.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save;
+			this.toolStripMenuItem66.Name = "toolStripMenuItem66";
+			this.toolStripMenuItem66.Size = new System.Drawing.Size(157, 22);
+			this.toolStripMenuItem66.Text = "Save Config";
+			this.toolStripMenuItem66.Click += new System.EventHandler(this.SaveConfigMenuItem_Click);
+			// 
+			// toolStripMenuItem67
+			// 
+			this.toolStripMenuItem67.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig;
+			this.toolStripMenuItem67.Name = "toolStripMenuItem67";
+			this.toolStripMenuItem67.Size = new System.Drawing.Size(157, 22);
+			this.toolStripMenuItem67.Text = "Load Config";
+			this.toolStripMenuItem67.Click += new System.EventHandler(this.LoadConfigMenuItem_Click);
+			// 
+			// ScreenshotContextMenuItem
+			// 
+			this.ScreenshotContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera;
+			this.ScreenshotContextMenuItem.Name = "ScreenshotContextMenuItem";
+			this.ScreenshotContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.ScreenshotContextMenuItem.Text = "Screenshot";
+			this.ScreenshotContextMenuItem.Click += new System.EventHandler(this.ScreenshotMenuItem_Click);
+			// 
+			// CloseRomContextMenuItem
+			// 
+			this.CloseRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close;
+			this.CloseRomContextMenuItem.Name = "CloseRomContextMenuItem";
+			this.CloseRomContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.CloseRomContextMenuItem.Text = "Close ROM";
+			this.CloseRomContextMenuItem.Click += new System.EventHandler(this.CloseRomMenuItem_Click);
+			// 
+			// ClearSRAMContextMenuItem
+			// 
+			this.ClearSRAMContextMenuItem.Name = "ClearSRAMContextMenuItem";
+			this.ClearSRAMContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.ClearSRAMContextMenuItem.Text = "Close and Clear SRAM";
+			this.ClearSRAMContextMenuItem.Click += new System.EventHandler(this.ClearSRAMContextMenuItem_Click);
+			// 
+			// ShowMenuContextMenuSeparator
+			// 
+			this.ShowMenuContextMenuSeparator.Name = "ShowMenuContextMenuSeparator";
+			this.ShowMenuContextMenuSeparator.Size = new System.Drawing.Size(198, 6);
+			// 
+			// ShowMenuContextMenuItem
+			// 
+			this.ShowMenuContextMenuItem.Name = "ShowMenuContextMenuItem";
+			this.ShowMenuContextMenuItem.Size = new System.Drawing.Size(201, 22);
+			this.ShowMenuContextMenuItem.Text = "Show Menu";
+			this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click);
+			// 
+			// timerMouseIdle
+			// 
+			this.timerMouseIdle.Enabled = true;
+			this.timerMouseIdle.Interval = 2000;
+			this.timerMouseIdle.Tick += new System.EventHandler(this.timerMouseIdle_Tick);
+			// 
+			// MainForm
+			// 
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+			this.ClientSize = new System.Drawing.Size(470, 408);
+			this.Controls.Add(this.MainStatusBar);
+			this.Controls.Add(this.MainformMenu);
+			this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.MainMenuStrip = this.MainformMenu;
+			this.Name = "MainForm";
+			this.Text = "BizHawk";
+			this.Activated += new System.EventHandler(this.MainForm_Activated);
+			this.Deactivate += new System.EventHandler(this.MainForm_Deactivate);
+			this.Load += new System.EventHandler(this.MainForm_Load);
+			this.Shown += new System.EventHandler(this.MainForm_Shown);
+			this.Enter += new System.EventHandler(this.MainForm_Enter);
+			this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.MainForm_MouseClick);
+			this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.MainForm_MouseMove);
+			this.Resize += new System.EventHandler(this.MainForm_Resize);
+			this.MainformMenu.ResumeLayout(false);
+			this.MainformMenu.PerformLayout();
+			this.MainStatusBar.ResumeLayout(false);
+			this.MainStatusBar.PerformLayout();
+			this.MainFormContextMenu.ResumeLayout(false);
+			this.ResumeLayout(false);
+			this.PerformLayout();
 
 		}
 
@@ -3993,6 +4002,7 @@
 		private System.Windows.Forms.ToolStripMenuItem DisplayMessagesMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem C64SubMenu;
 		private System.Windows.Forms.ToolStripMenuItem C64SettingsMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem16;
 	}
 }
 
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index ece2cd3a0d..c44de242b5 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3909,6 +3909,5 @@ namespace BizHawk.Client.EmuHawk
 		}
 
 
-
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.Designer.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.Designer.cs
index edab26816e..73fbfee987 100644
--- a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.Designer.cs
@@ -54,9 +54,9 @@
 			this.LoggingActiveCheckbox.AutoSize = true;
 			this.LoggingActiveCheckbox.Location = new System.Drawing.Point(12, 244);
 			this.LoggingActiveCheckbox.Name = "LoggingActiveCheckbox";
-			this.LoggingActiveCheckbox.Size = new System.Drawing.Size(101, 17);
+			this.LoggingActiveCheckbox.Size = new System.Drawing.Size(107, 17);
 			this.LoggingActiveCheckbox.TabIndex = 1;
-			this.LoggingActiveCheckbox.Text = "Loging is Active";
+			this.LoggingActiveCheckbox.Text = "Logging is Active";
 			this.LoggingActiveCheckbox.UseVisualStyleBackColor = true;
 			this.LoggingActiveCheckbox.CheckedChanged += new System.EventHandler(this.LoggingActiveCheckbox_CheckedChanged);
 			// 
diff --git a/BizHawk.Common/Extensions/IOExtensions.cs b/BizHawk.Common/Extensions/IOExtensions.cs
index d1a3f7d0b7..dc49534c22 100644
--- a/BizHawk.Common/Extensions/IOExtensions.cs
+++ b/BizHawk.Common/Extensions/IOExtensions.cs
@@ -25,6 +25,7 @@ namespace BizHawk.Common.IOExtensions
 		}
 
 		// Read bytes from a BinaryReader and translate them into the UTF-8 string they represent.
+		//WHAT? WHY IS THIS NAMED ASCII BUT USING UTF8
 		public static string ReadStringFixedAscii(this BinaryReader r, int bytes)
 		{
 			var read = new byte[bytes];
diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index 4bc13fcbf3..dc3bedcbe2 100644
--- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -346,6 +346,7 @@
     </Compile>
     <Compile Include="Consoles\Intellivision\PSG.cs" />
     <Compile Include="Consoles\Intellivision\STIC.cs" />
+    <Compile Include="Consoles\Nintendo\Gameboy\CodeDataLog_GB.cs" />
     <Compile Include="Consoles\Nintendo\Gameboy\Gambatte.cs" />
     <Compile Include="Consoles\Nintendo\Gameboy\Gambatte.IDebuggable.cs">
       <DependentUpon>Gambatte.cs</DependentUpon>
diff --git a/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs
index 9aac4e1f53..c43c94b7af 100644
--- a/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs
+++ b/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs
@@ -5,54 +5,27 @@ using System.Text;
 using System.IO;
 using BizHawk.Emulation.Common;
 
+//TODO - reorg please
+using BizHawk.Emulation.Cores.Nintendo.Gameboy;
+
 namespace BizHawk.Emulation.Cores.Components.H6280
 {
-	public class CodeDataLog : Dictionary<string, byte[]>
+	public class CodeDataLog_PCE : CodeDataLog
 	{
-		private CodeDataLog()
-			:base()
+		public static CodeDataLog_PCE Create(IEnumerable<HuC6280.MemMapping> mm)
 		{
-		}
-
-		public void LogicalOrFrom(CodeDataLog other)
-		{
-			if (this.Count != other.Count)
-				throw new InvalidDataException("Dictionaries must have the same number of keys!");
-
-			foreach (var kvp in other)
+			var t = new CodeDataLog_PCE();
+			foreach (var kvp in SizesFromHuMap(mm))
 			{
-				byte[] fromdata = kvp.Value;
-				byte[] todata = this[kvp.Key];
-
-				if (fromdata.Length != todata.Length)
-					throw new InvalidDataException("Memory regions must be the same size!");
-
-				for (int i = 0; i < todata.Length; i++)
-					todata[i] |= fromdata[i];
+				t[kvp.Key] = new byte[kvp.Value];
 			}
+			return t;
 		}
 
-		public void ClearData()
-		{
-			foreach (byte[] data in Values)
-				Array.Clear(data, 0, data.Length);
-		}
+		public override string SubType { get { return "PCE"; } }
+		public override int SubVer { get { return 0; } }
 
-		public void Save(Stream s)
-		{
-			var w = new BinaryWriter(s);
-			w.Write("BIZHAWK-CDL-1");
-			w.Write(Count);
-			foreach (var kvp in this)
-			{
-				w.Write(kvp.Key);
-				w.Write(kvp.Value.Length);
-				w.Write(kvp.Value);
-			}
-			w.Flush();
-		}
-
-		public void Disassemble(Stream s, IMemoryDomains mem)
+		public override void Disassemble(Stream s, IMemoryDomains mem)
 		{
 			var w = new StreamWriter(s);
 			w.WriteLine("; Bizhawk CDL Disassembly");
@@ -90,26 +63,9 @@ namespace BizHawk.Emulation.Cores.Components.H6280
 			w.Flush();
 		}
 
-		public static CodeDataLog Load(Stream s)
-		{
-			var t = new CodeDataLog();
-			var r = new BinaryReader(s);
-			string id = r.ReadString();
-			if (id != "BIZHAWK-CDL-1")
-				throw new InvalidDataException("File is not a Bizhawk CDL file!");
-			int count = r.ReadInt32();
-			for (int i = 0; i < count; i++)
-			{
-				string key = r.ReadString();
-				int len = r.ReadInt32();
-				byte[] data = r.ReadBytes(len);
-				t[key] = data;
-			}
-			return t;
-		}
-
-		public bool CheckConsistency(IEnumerable<HuC6280.MemMapping> mm)
+		public bool CheckConsistency(object arg)
 		{
+			var mm = (IEnumerable<HuC6280.MemMapping>)arg;
 			var sizes = SizesFromHuMap(mm);
 			if (sizes.Count != Count)
 				return false;
@@ -140,15 +96,95 @@ namespace BizHawk.Emulation.Cores.Components.H6280
 			}
 			return sizes;
 		}
+	}
 
-		public static CodeDataLog Create(IEnumerable<HuC6280.MemMapping> mm)
+	public abstract class CodeDataLog : Dictionary<string, byte[]>
+	{
+		public CodeDataLog()
+			:base()
 		{
-			var t = new CodeDataLog();
-			foreach (var kvp in SizesFromHuMap(mm))
+		}
+
+		/// <summary>
+		/// You don't have to use this necessarily, it's just provided for convenience
+		/// </summary>
+		public bool Active;
+
+		public virtual void Disassemble(Stream s, IMemoryDomains mem) { }
+
+		public abstract string SubType { get; }
+		public abstract int SubVer { get; }
+
+		public void LogicalOrFrom(CodeDataLog other)
+		{
+			if (this.Count != other.Count)
+				throw new InvalidDataException("Dictionaries must have the same number of keys!");
+
+			foreach (var kvp in other)
 			{
-				t[kvp.Key] = new byte[kvp.Value];
+				byte[] fromdata = kvp.Value;
+				byte[] todata = this[kvp.Key];
+
+				if (fromdata.Length != todata.Length)
+					throw new InvalidDataException("Memory regions must be the same size!");
+
+				for (int i = 0; i < todata.Length; i++)
+					todata[i] |= fromdata[i];
 			}
-			return t;
+		}
+
+		public void ClearData()
+		{
+			foreach (byte[] data in Values)
+				Array.Clear(data, 0, data.Length);
+		}
+
+		public void Save(Stream s)
+		{
+			var w = new BinaryWriter(s);
+			w.Write("BIZHAWK-CDL-2");
+			w.Write(SubType.PadRight(15));
+			w.Write(Count);
+			foreach (var kvp in this)
+			{
+				w.Write(kvp.Key);
+				w.Write(kvp.Value.Length);
+				w.Write(kvp.Value);
+			}
+			w.Flush();
+		}
+
+		public static CodeDataLog Load(Stream s)
+		{
+			var br = new BinaryReader(s);
+			string id = br.ReadString();
+			string FileSubType;
+			if (id == "BIZHAWK-CDL-1")
+				FileSubType = "PCE";
+			else if (id == "BIZHAWK-CDL-2")
+				FileSubType = br.ReadString().TrimEnd(' ');
+			else
+				throw new InvalidDataException("File is not a Bizhawk CDL file!");
+
+			if (FileSubType == "PCE")
+				return new CodeDataLog_PCE().Load(br);
+			else if(FileSubType == "GB")
+				return new CodeDataLog_GB().Load(br);
+			else return null;
+		}
+
+		private CodeDataLog Load(BinaryReader br)
+		{
+			int count = br.ReadInt32();
+			for (int i = 0; i < count; i++)
+			{
+				string key = br.ReadString();
+				int len = br.ReadInt32();
+				byte[] data = br.ReadBytes(len);
+				this[key] = data;
+			}
+
+			return this;
 		}
 	}
 
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/CodeDataLog_GB.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/CodeDataLog_GB.cs
new file mode 100644
index 0000000000..c4321fe2fc
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/CodeDataLog_GB.cs
@@ -0,0 +1,23 @@
+using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Cores.Components.H6280;
+
+//TODO - refactor into different files
+
+namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
+{
+	public class CodeDataLog_GB : CodeDataLog
+	{
+		public static CodeDataLog_GB Create(IMemoryDomains memdomains)
+		{
+			var t = new CodeDataLog_GB();
+			t["ROM"] = new byte[memdomains["ROM"].Size];
+			//t["HRAM"] = new byte[memdomains["HRAM"].Size]; //this is probably useless, but it's here if someone needs it
+			t["WRAM"] = new byte[memdomains["WRAM"].Size];
+			t["CartRAM"] = new byte[memdomains["Cart RAM"].Size];
+			return t;
+		}
+
+		public override string SubType { get { return "GB"; } }
+		public override int SubVer { get { return 0; } }
+	}
+}
\ No newline at end of file
diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.CDLMapping.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.CDLMapping.cs
index 0bb2b2d864..558745beee 100644
--- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.CDLMapping.cs	
+++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.CDLMapping.cs	
@@ -18,9 +18,9 @@ namespace BizHawk.Emulation.Cores.PCEngine
 			}
 		}
 
-	    /// <summary>
+		/// <summary>
 		/// informs the CPU of the general memory layout, so it can do CDL
-	    /// </summary>
+		/// </summary>
 		public void InitCDLMappings()
 		{
 			if (Cpu.Mappings != null)