diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs
index 1905723e75..dfc492e456 100644
--- a/BizHawk.MultiClient/MainForm.Designer.cs
+++ b/BizHawk.MultiClient/MainForm.Designer.cs
@@ -28,254 +28,254 @@
         /// </summary>
         private void InitializeComponent()
         {
-			this.components = new System.ComponentModel.Container();
-			this.menuStrip1 = new MenuStripEx();
-			this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.openROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.recentROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-			this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.autoloadMostRecentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.closeROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
-			this.saveStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.savestate1toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.savestate2toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.savestate3toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.savestate4toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.savestate5toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.savestate6toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.savestate7toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.savestate8toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.savestate9toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.savestate0toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
-			this.saveNamedStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadstate1toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadstate2toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadstate3toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadstate4toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadstate5toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadstate6toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadstate7toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadstate8toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadstate9toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadstate0toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
-			this.loadNamedStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator();
-			this.autoLoadLastSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.saveSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.selectSlot10ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.selectSlot1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.selectSlot2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.selectSlot3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.selectSlot4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.selectSlot5ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.selectSlot6ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.selectSlot7ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.selectSlot8ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.selectSlot9ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.previousSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.nextSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
-			this.saveToCurrentSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadCurrentSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
-			this.movieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.readonlyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
-			this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.noneToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
-			this.clearToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.autoloadMostRecentToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.recordMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.playMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.stopMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.playFromBeginningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.importMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
-			this.bindSavestatesToMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.automaticallyBackupMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.aVIWAVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.recordAVIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.stopAVIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.screenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.screenshotF12ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.screenshotAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.screenshotClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.animatedGIFConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.makeAnimatedGIFToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.makeAnimatedGifAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-			this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.emulationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.pauseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-			this.powerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.windowSizeMenuItem = 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.switchToFullscreenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-			this.displayFPSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.displayFrameCounterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.displayLagCounterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.displayInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.displayRerecordCountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.displaySubtitlesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
-			this.displayStatusBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.displayLogWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.controllersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.hotkeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.messagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.pathsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.soundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.autofireToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
-			this.gUIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.pauseWhenMenuActivatedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.startPausedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.frameAdvanceSkipLagFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
-			this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.forceGDIPPresentationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.showMenuInFullScreenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.runInBackgroundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.acceptBackgroundInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.singleInstanceModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator24 = new System.Windows.Forms.ToolStripSeparator();
-			this.enableRewindToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.enableContextMenuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.backupSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.autoSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.saveScreenshotWithSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator();
-			this.logWindowAsConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.frameSkipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.miLimitFramerate = new System.Windows.Forms.ToolStripMenuItem();
-			this.miDisplayVsync = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
-			this.miAutoMinimizeSkipping = new System.Windows.Forms.ToolStripMenuItem();
-			this.miFrameskip0 = new System.Windows.Forms.ToolStripMenuItem();
-			this.miFrameskip1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.miFrameskip2 = new System.Windows.Forms.ToolStripMenuItem();
-			this.miFrameskip3 = new System.Windows.Forms.ToolStripMenuItem();
-			this.miFrameskip4 = new System.Windows.Forms.ToolStripMenuItem();
-			this.miFrameskip5 = new System.Windows.Forms.ToolStripMenuItem();
-			this.miFrameskip6 = new System.Windows.Forms.ToolStripMenuItem();
-			this.miFrameskip7 = new System.Windows.Forms.ToolStripMenuItem();
-			this.miFrameskip8 = new System.Windows.Forms.ToolStripMenuItem();
-			this.miFrameskip9 = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator();
-			this.miSpeed50 = new System.Windows.Forms.ToolStripMenuItem();
-			this.miSpeed75 = new System.Windows.Forms.ToolStripMenuItem();
-			this.miSpeed100 = new System.Windows.Forms.ToolStripMenuItem();
-			this.miSpeed150 = new System.Windows.Forms.ToolStripMenuItem();
-			this.miSpeed200 = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
-			this.saveConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolBoxToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
-			this.rAMWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.rAMSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.rAMPokeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.hexEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.tAStudioToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
-			this.luaConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.cheatsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.NESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.debuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.pPUViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.nametableViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.gameGenieCodesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
-			this.graphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.pCEToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.pceBGViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator();
-			this.pceAlwaysPerformSpriteLimitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.pceAlwaysEqualizeVolumesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.pceArcadeCardRewindEnableHackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.pceGraphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.sMSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.smsEnableFMChipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.smsOverclockWhenKnownSafeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.smsForceStereoSeparationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.smsSpriteLimitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.smsGraphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.tI83ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.keypadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
-			this.autoloadVirtualKeyboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.gBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.debuggerToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.forumsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.StatusSlot0 = new System.Windows.Forms.StatusStrip();
-			this.DumpStatus = new System.Windows.Forms.ToolStripDropDownButton();
-			this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel();
-			this.PlayRecordStatus = new System.Windows.Forms.ToolStripDropDownButton();
-			this.PauseStrip = new System.Windows.Forms.ToolStripDropDownButton();
-			this.FreezeStatus = new System.Windows.Forms.ToolStripMenuItem();
-			this.AVIStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
-			this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.StatusSlot1 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.StatusSlot2 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.StatusSlot3 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.StatusSlot4 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.StatusSlot5 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.StatusSlot6 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.StatusSlot7 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.StatusSlot8 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.StatusSlot9 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.StatusSlot10 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.CheatStatus = new System.Windows.Forms.ToolStripStatusLabel();
-			this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-			this.openRomToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadLastROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator();
-			this.recordMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.playMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.restartMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.stopMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.loadLastMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.makeMovieBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.viewSubtitlesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.viewCommentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator();
-			this.undoLoadstateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.undoSavestateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
-			this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
-			this.screenshotToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.closeROMToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.showMenuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.menuStrip1.SuspendLayout();
-			this.StatusSlot0.SuspendLayout();
-			this.contextMenuStrip1.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// menuStrip1
-			// 
-			this.menuStrip1.ClickThrough = true;
-			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.components = new System.ComponentModel.Container();
+            this.menuStrip1 = new MenuStripEx();
+            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.openROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.recentROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+            this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.autoloadMostRecentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.closeROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
+            this.saveStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.savestate1toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.savestate2toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.savestate3toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.savestate4toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.savestate5toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.savestate6toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.savestate7toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.savestate8toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.savestate9toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.savestate0toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+            this.saveNamedStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadstate1toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadstate2toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadstate3toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadstate4toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadstate5toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadstate6toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadstate7toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadstate8toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadstate9toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadstate0toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+            this.loadNamedStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator();
+            this.autoLoadLastSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.saveSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.selectSlot10ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.selectSlot1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.selectSlot2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.selectSlot3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.selectSlot4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.selectSlot5ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.selectSlot6ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.selectSlot7ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.selectSlot8ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.selectSlot9ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.previousSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.nextSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+            this.saveToCurrentSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadCurrentSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
+            this.movieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.readonlyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
+            this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.noneToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
+            this.clearToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.autoloadMostRecentToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.recordMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.playMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.stopMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.playFromBeginningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.importMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
+            this.bindSavestatesToMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.automaticallyBackupMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.aVIWAVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.recordAVIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.stopAVIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.screenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.screenshotF12ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.screenshotAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.screenshotClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.animatedGIFConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.makeAnimatedGIFToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.makeAnimatedGifAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+            this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.emulationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.pauseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.powerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.windowSizeMenuItem = 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.switchToFullscreenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.displayFPSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.displayFrameCounterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.displayLagCounterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.displayInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.displayRerecordCountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.displaySubtitlesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
+            this.displayStatusBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.displayLogWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.controllersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.hotkeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.messagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.pathsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.soundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.autofireToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+            this.gUIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.pauseWhenMenuActivatedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.startPausedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.frameAdvanceSkipLagFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
+            this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.forceGDIPPresentationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.showMenuInFullScreenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.runInBackgroundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.acceptBackgroundInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.singleInstanceModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator24 = new System.Windows.Forms.ToolStripSeparator();
+            this.enableRewindToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.enableContextMenuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.backupSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.autoSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.saveScreenshotWithSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator();
+            this.logWindowAsConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.frameSkipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.miLimitFramerate = new System.Windows.Forms.ToolStripMenuItem();
+            this.miDisplayVsync = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
+            this.miAutoMinimizeSkipping = new System.Windows.Forms.ToolStripMenuItem();
+            this.miFrameskip0 = new System.Windows.Forms.ToolStripMenuItem();
+            this.miFrameskip1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.miFrameskip2 = new System.Windows.Forms.ToolStripMenuItem();
+            this.miFrameskip3 = new System.Windows.Forms.ToolStripMenuItem();
+            this.miFrameskip4 = new System.Windows.Forms.ToolStripMenuItem();
+            this.miFrameskip5 = new System.Windows.Forms.ToolStripMenuItem();
+            this.miFrameskip6 = new System.Windows.Forms.ToolStripMenuItem();
+            this.miFrameskip7 = new System.Windows.Forms.ToolStripMenuItem();
+            this.miFrameskip8 = new System.Windows.Forms.ToolStripMenuItem();
+            this.miFrameskip9 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator();
+            this.miSpeed50 = new System.Windows.Forms.ToolStripMenuItem();
+            this.miSpeed75 = new System.Windows.Forms.ToolStripMenuItem();
+            this.miSpeed100 = new System.Windows.Forms.ToolStripMenuItem();
+            this.miSpeed150 = new System.Windows.Forms.ToolStripMenuItem();
+            this.miSpeed200 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
+            this.saveConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolBoxToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
+            this.rAMWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.rAMSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.rAMPokeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.hexEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.tAStudioToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
+            this.luaConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.cheatsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.NESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.debuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.pPUViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.nametableViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.gameGenieCodesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
+            this.graphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.pCEToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.pceBGViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator();
+            this.pceAlwaysPerformSpriteLimitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.pceAlwaysEqualizeVolumesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.pceArcadeCardRewindEnableHackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.pceGraphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.sMSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.smsEnableFMChipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.smsOverclockWhenKnownSafeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.smsForceStereoSeparationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.smsSpriteLimitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.smsGraphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.tI83ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.keypadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
+            this.autoloadVirtualKeyboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.gBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.debuggerToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.forumsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.StatusSlot0 = new System.Windows.Forms.StatusStrip();
+            this.DumpStatus = new System.Windows.Forms.ToolStripDropDownButton();
+            this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel();
+            this.PlayRecordStatus = new System.Windows.Forms.ToolStripDropDownButton();
+            this.PauseStrip = new System.Windows.Forms.ToolStripDropDownButton();
+            this.FreezeStatus = new System.Windows.Forms.ToolStripMenuItem();
+            this.AVIStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.StatusSlot1 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.StatusSlot2 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.StatusSlot3 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.StatusSlot4 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.StatusSlot5 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.StatusSlot6 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.StatusSlot7 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.StatusSlot8 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.StatusSlot9 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.StatusSlot10 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.CheatStatus = new System.Windows.Forms.ToolStripStatusLabel();
+            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.openRomToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadLastROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator();
+            this.recordMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.playMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.restartMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.stopMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadLastMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.makeMovieBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.viewSubtitlesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.viewCommentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator();
+            this.undoLoadstateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.undoSavestateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
+            this.screenshotToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.closeROMToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.showMenuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuStrip1.SuspendLayout();
+            this.StatusSlot0.SuspendLayout();
+            this.contextMenuStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // menuStrip1
+            // 
+            this.menuStrip1.ClickThrough = true;
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.fileToolStripMenuItem,
             this.emulationToolStripMenuItem,
             this.viewToolStripMenuItem,
@@ -287,18 +287,18 @@
             this.tI83ToolStripMenuItem,
             this.gBToolStripMenuItem,
             this.helpToolStripMenuItem});
-			this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
-			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-			this.menuStrip1.Name = "menuStrip1";
-			this.menuStrip1.Size = new System.Drawing.Size(470, 21);
-			this.menuStrip1.TabIndex = 0;
-			this.menuStrip1.Text = "menuStrip1";
-			this.menuStrip1.MenuActivate += new System.EventHandler(this.menuStrip1_MenuActivate);
-			this.menuStrip1.MenuDeactivate += new System.EventHandler(this.menuStrip1_MenuDeactivate);
-			// 
-			// fileToolStripMenuItem
-			// 
-			this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Size = new System.Drawing.Size(470, 42);
+            this.menuStrip1.TabIndex = 0;
+            this.menuStrip1.Text = "menuStrip1";
+            this.menuStrip1.MenuActivate += new System.EventHandler(this.menuStrip1_MenuActivate);
+            this.menuStrip1.MenuDeactivate += new System.EventHandler(this.menuStrip1_MenuDeactivate);
+            // 
+            // fileToolStripMenuItem
+            // 
+            this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.openROMToolStripMenuItem,
             this.recentROMToolStripMenuItem,
             this.closeROMToolStripMenuItem,
@@ -312,73 +312,73 @@
             this.screenshotToolStripMenuItem,
             this.toolStripSeparator4,
             this.exitToolStripMenuItem});
-			this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-			this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 17);
-			this.fileToolStripMenuItem.Text = "&File";
-			this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened);
-			// 
-			// openROMToolStripMenuItem
-			// 
-			this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
-			this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem";
-			this.openROMToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
-			this.openROMToolStripMenuItem.Text = "Open ROM";
-			this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click);
-			// 
-			// recentROMToolStripMenuItem
-			// 
-			this.recentROMToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 19);
+            this.fileToolStripMenuItem.Text = "&File";
+            this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened);
+            // 
+            // openROMToolStripMenuItem
+            // 
+            this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
+            this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem";
+            this.openROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
+            this.openROMToolStripMenuItem.Text = "Open ROM";
+            this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click);
+            // 
+            // recentROMToolStripMenuItem
+            // 
+            this.recentROMToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.noneToolStripMenuItem,
             this.toolStripSeparator3,
             this.clearToolStripMenuItem,
             this.autoloadMostRecentToolStripMenuItem});
-			this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
-			this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem";
-			this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
-			this.recentROMToolStripMenuItem.Text = "Recent ROM";
-			this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened);
-			// 
-			// noneToolStripMenuItem
-			// 
-			this.noneToolStripMenuItem.Name = "noneToolStripMenuItem";
-			this.noneToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-			this.noneToolStripMenuItem.Text = "None";
-			// 
-			// toolStripSeparator3
-			// 
-			this.toolStripSeparator3.Name = "toolStripSeparator3";
-			this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
-			// 
-			// clearToolStripMenuItem
-			// 
-			this.clearToolStripMenuItem.Name = "clearToolStripMenuItem";
-			this.clearToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-			this.clearToolStripMenuItem.Text = "&Clear";
-			this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click);
-			// 
-			// autoloadMostRecentToolStripMenuItem
-			// 
-			this.autoloadMostRecentToolStripMenuItem.Name = "autoloadMostRecentToolStripMenuItem";
-			this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-			this.autoloadMostRecentToolStripMenuItem.Text = "&Autoload Most Recent";
-			this.autoloadMostRecentToolStripMenuItem.Click += new System.EventHandler(this.autoloadMostRecentToolStripMenuItem_Click);
-			// 
-			// closeROMToolStripMenuItem
-			// 
-			this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close;
-			this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem";
-			this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
-			this.closeROMToolStripMenuItem.Text = "&Close ROM";
-			this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click);
-			// 
-			// toolStripMenuItem1
-			// 
-			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-			this.toolStripMenuItem1.Size = new System.Drawing.Size(131, 6);
-			// 
-			// saveStateToolStripMenuItem
-			// 
-			this.saveStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
+            this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem";
+            this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
+            this.recentROMToolStripMenuItem.Text = "Recent ROM";
+            this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened);
+            // 
+            // noneToolStripMenuItem
+            // 
+            this.noneToolStripMenuItem.Name = "noneToolStripMenuItem";
+            this.noneToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
+            this.noneToolStripMenuItem.Text = "None";
+            // 
+            // toolStripSeparator3
+            // 
+            this.toolStripSeparator3.Name = "toolStripSeparator3";
+            this.toolStripSeparator3.Size = new System.Drawing.Size(189, 6);
+            // 
+            // clearToolStripMenuItem
+            // 
+            this.clearToolStripMenuItem.Name = "clearToolStripMenuItem";
+            this.clearToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
+            this.clearToolStripMenuItem.Text = "&Clear";
+            this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click);
+            // 
+            // autoloadMostRecentToolStripMenuItem
+            // 
+            this.autoloadMostRecentToolStripMenuItem.Name = "autoloadMostRecentToolStripMenuItem";
+            this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
+            this.autoloadMostRecentToolStripMenuItem.Text = "&Autoload Most Recent";
+            this.autoloadMostRecentToolStripMenuItem.Click += new System.EventHandler(this.autoloadMostRecentToolStripMenuItem_Click);
+            // 
+            // closeROMToolStripMenuItem
+            // 
+            this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close;
+            this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem";
+            this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
+            this.closeROMToolStripMenuItem.Text = "&Close ROM";
+            this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click);
+            // 
+            // toolStripMenuItem1
+            // 
+            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(137, 6);
+            // 
+            // saveStateToolStripMenuItem
+            // 
+            this.saveStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.savestate1toolStripMenuItem,
             this.savestate2toolStripMenuItem,
             this.savestate3toolStripMenuItem,
@@ -391,96 +391,96 @@
             this.savestate0toolStripMenuItem,
             this.toolStripSeparator6,
             this.saveNamedStateToolStripMenuItem});
-			this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem";
-			this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
-			this.saveStateToolStripMenuItem.Text = "Save State";
-			this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened);
-			// 
-			// savestate1toolStripMenuItem
-			// 
-			this.savestate1toolStripMenuItem.Name = "savestate1toolStripMenuItem";
-			this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(175, 22);
-			this.savestate1toolStripMenuItem.Text = "1";
-			this.savestate1toolStripMenuItem.Click += new System.EventHandler(this.savestate1toolStripMenuItem_Click);
-			// 
-			// savestate2toolStripMenuItem
-			// 
-			this.savestate2toolStripMenuItem.Name = "savestate2toolStripMenuItem";
-			this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(175, 22);
-			this.savestate2toolStripMenuItem.Text = "2";
-			this.savestate2toolStripMenuItem.Click += new System.EventHandler(this.savestate2toolStripMenuItem_Click);
-			// 
-			// savestate3toolStripMenuItem
-			// 
-			this.savestate3toolStripMenuItem.Name = "savestate3toolStripMenuItem";
-			this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(175, 22);
-			this.savestate3toolStripMenuItem.Text = "3";
-			this.savestate3toolStripMenuItem.Click += new System.EventHandler(this.savestate3toolStripMenuItem_Click);
-			// 
-			// savestate4toolStripMenuItem
-			// 
-			this.savestate4toolStripMenuItem.Name = "savestate4toolStripMenuItem";
-			this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(175, 22);
-			this.savestate4toolStripMenuItem.Text = "4";
-			this.savestate4toolStripMenuItem.Click += new System.EventHandler(this.savestate4toolStripMenuItem_Click);
-			// 
-			// savestate5toolStripMenuItem
-			// 
-			this.savestate5toolStripMenuItem.Name = "savestate5toolStripMenuItem";
-			this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(175, 22);
-			this.savestate5toolStripMenuItem.Text = "5";
-			this.savestate5toolStripMenuItem.Click += new System.EventHandler(this.savestate5toolStripMenuItem_Click);
-			// 
-			// savestate6toolStripMenuItem
-			// 
-			this.savestate6toolStripMenuItem.Name = "savestate6toolStripMenuItem";
-			this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(175, 22);
-			this.savestate6toolStripMenuItem.Text = "6";
-			this.savestate6toolStripMenuItem.Click += new System.EventHandler(this.savestate6toolStripMenuItem_Click);
-			// 
-			// savestate7toolStripMenuItem
-			// 
-			this.savestate7toolStripMenuItem.Name = "savestate7toolStripMenuItem";
-			this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(175, 22);
-			this.savestate7toolStripMenuItem.Text = "7";
-			this.savestate7toolStripMenuItem.Click += new System.EventHandler(this.savestate7toolStripMenuItem_Click);
-			// 
-			// savestate8toolStripMenuItem
-			// 
-			this.savestate8toolStripMenuItem.Name = "savestate8toolStripMenuItem";
-			this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(175, 22);
-			this.savestate8toolStripMenuItem.Text = "8";
-			this.savestate8toolStripMenuItem.Click += new System.EventHandler(this.savestate8toolStripMenuItem_Click);
-			// 
-			// savestate9toolStripMenuItem
-			// 
-			this.savestate9toolStripMenuItem.Name = "savestate9toolStripMenuItem";
-			this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(175, 22);
-			this.savestate9toolStripMenuItem.Text = "9";
-			this.savestate9toolStripMenuItem.Click += new System.EventHandler(this.savestate9toolStripMenuItem_Click);
-			// 
-			// savestate0toolStripMenuItem
-			// 
-			this.savestate0toolStripMenuItem.Name = "savestate0toolStripMenuItem";
-			this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(175, 22);
-			this.savestate0toolStripMenuItem.Text = "0";
-			this.savestate0toolStripMenuItem.Click += new System.EventHandler(this.savestate0toolStripMenuItem_Click);
-			// 
-			// toolStripSeparator6
-			// 
-			this.toolStripSeparator6.Name = "toolStripSeparator6";
-			this.toolStripSeparator6.Size = new System.Drawing.Size(172, 6);
-			// 
-			// saveNamedStateToolStripMenuItem
-			// 
-			this.saveNamedStateToolStripMenuItem.Name = "saveNamedStateToolStripMenuItem";
-			this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
-			this.saveNamedStateToolStripMenuItem.Text = "Save Named State...";
-			this.saveNamedStateToolStripMenuItem.Click += new System.EventHandler(this.saveNamedStateToolStripMenuItem_Click);
-			// 
-			// loadStateToolStripMenuItem
-			// 
-			this.loadStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem";
+            this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
+            this.saveStateToolStripMenuItem.Text = "Save State";
+            this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened);
+            // 
+            // savestate1toolStripMenuItem
+            // 
+            this.savestate1toolStripMenuItem.Name = "savestate1toolStripMenuItem";
+            this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.savestate1toolStripMenuItem.Text = "1";
+            this.savestate1toolStripMenuItem.Click += new System.EventHandler(this.savestate1toolStripMenuItem_Click);
+            // 
+            // savestate2toolStripMenuItem
+            // 
+            this.savestate2toolStripMenuItem.Name = "savestate2toolStripMenuItem";
+            this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.savestate2toolStripMenuItem.Text = "2";
+            this.savestate2toolStripMenuItem.Click += new System.EventHandler(this.savestate2toolStripMenuItem_Click);
+            // 
+            // savestate3toolStripMenuItem
+            // 
+            this.savestate3toolStripMenuItem.Name = "savestate3toolStripMenuItem";
+            this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.savestate3toolStripMenuItem.Text = "3";
+            this.savestate3toolStripMenuItem.Click += new System.EventHandler(this.savestate3toolStripMenuItem_Click);
+            // 
+            // savestate4toolStripMenuItem
+            // 
+            this.savestate4toolStripMenuItem.Name = "savestate4toolStripMenuItem";
+            this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.savestate4toolStripMenuItem.Text = "4";
+            this.savestate4toolStripMenuItem.Click += new System.EventHandler(this.savestate4toolStripMenuItem_Click);
+            // 
+            // savestate5toolStripMenuItem
+            // 
+            this.savestate5toolStripMenuItem.Name = "savestate5toolStripMenuItem";
+            this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.savestate5toolStripMenuItem.Text = "5";
+            this.savestate5toolStripMenuItem.Click += new System.EventHandler(this.savestate5toolStripMenuItem_Click);
+            // 
+            // savestate6toolStripMenuItem
+            // 
+            this.savestate6toolStripMenuItem.Name = "savestate6toolStripMenuItem";
+            this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.savestate6toolStripMenuItem.Text = "6";
+            this.savestate6toolStripMenuItem.Click += new System.EventHandler(this.savestate6toolStripMenuItem_Click);
+            // 
+            // savestate7toolStripMenuItem
+            // 
+            this.savestate7toolStripMenuItem.Name = "savestate7toolStripMenuItem";
+            this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.savestate7toolStripMenuItem.Text = "7";
+            this.savestate7toolStripMenuItem.Click += new System.EventHandler(this.savestate7toolStripMenuItem_Click);
+            // 
+            // savestate8toolStripMenuItem
+            // 
+            this.savestate8toolStripMenuItem.Name = "savestate8toolStripMenuItem";
+            this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.savestate8toolStripMenuItem.Text = "8";
+            this.savestate8toolStripMenuItem.Click += new System.EventHandler(this.savestate8toolStripMenuItem_Click);
+            // 
+            // savestate9toolStripMenuItem
+            // 
+            this.savestate9toolStripMenuItem.Name = "savestate9toolStripMenuItem";
+            this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.savestate9toolStripMenuItem.Text = "9";
+            this.savestate9toolStripMenuItem.Click += new System.EventHandler(this.savestate9toolStripMenuItem_Click);
+            // 
+            // savestate0toolStripMenuItem
+            // 
+            this.savestate0toolStripMenuItem.Name = "savestate0toolStripMenuItem";
+            this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.savestate0toolStripMenuItem.Text = "0";
+            this.savestate0toolStripMenuItem.Click += new System.EventHandler(this.savestate0toolStripMenuItem_Click);
+            // 
+            // toolStripSeparator6
+            // 
+            this.toolStripSeparator6.Name = "toolStripSeparator6";
+            this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6);
+            // 
+            // saveNamedStateToolStripMenuItem
+            // 
+            this.saveNamedStateToolStripMenuItem.Name = "saveNamedStateToolStripMenuItem";
+            this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.saveNamedStateToolStripMenuItem.Text = "Save Named State...";
+            this.saveNamedStateToolStripMenuItem.Click += new System.EventHandler(this.saveNamedStateToolStripMenuItem_Click);
+            // 
+            // loadStateToolStripMenuItem
+            // 
+            this.loadStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.loadstate1toolStripMenuItem,
             this.loadstate2toolStripMenuItem,
             this.loadstate3toolStripMenuItem,
@@ -495,108 +495,108 @@
             this.loadNamedStateToolStripMenuItem,
             this.toolStripSeparator21,
             this.autoLoadLastSlotToolStripMenuItem});
-			this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem";
-			this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
-			this.loadStateToolStripMenuItem.Text = "Load State";
-			this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened);
-			// 
-			// loadstate1toolStripMenuItem
-			// 
-			this.loadstate1toolStripMenuItem.Name = "loadstate1toolStripMenuItem";
-			this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.loadstate1toolStripMenuItem.Text = "1";
-			this.loadstate1toolStripMenuItem.Click += new System.EventHandler(this.loadstate1toolStripMenuItem_Click);
-			// 
-			// loadstate2toolStripMenuItem
-			// 
-			this.loadstate2toolStripMenuItem.Name = "loadstate2toolStripMenuItem";
-			this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.loadstate2toolStripMenuItem.Text = "2";
-			this.loadstate2toolStripMenuItem.Click += new System.EventHandler(this.loadstate2toolStripMenuItem_Click);
-			// 
-			// loadstate3toolStripMenuItem
-			// 
-			this.loadstate3toolStripMenuItem.Name = "loadstate3toolStripMenuItem";
-			this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.loadstate3toolStripMenuItem.Text = "3";
-			this.loadstate3toolStripMenuItem.Click += new System.EventHandler(this.loadstate3toolStripMenuItem_Click);
-			// 
-			// loadstate4toolStripMenuItem
-			// 
-			this.loadstate4toolStripMenuItem.Name = "loadstate4toolStripMenuItem";
-			this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.loadstate4toolStripMenuItem.Text = "4";
-			this.loadstate4toolStripMenuItem.Click += new System.EventHandler(this.loadstate4toolStripMenuItem_Click);
-			// 
-			// loadstate5toolStripMenuItem
-			// 
-			this.loadstate5toolStripMenuItem.Name = "loadstate5toolStripMenuItem";
-			this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.loadstate5toolStripMenuItem.Text = "5";
-			this.loadstate5toolStripMenuItem.Click += new System.EventHandler(this.loadstate5toolStripMenuItem_Click);
-			// 
-			// loadstate6toolStripMenuItem
-			// 
-			this.loadstate6toolStripMenuItem.Name = "loadstate6toolStripMenuItem";
-			this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.loadstate6toolStripMenuItem.Text = "6";
-			this.loadstate6toolStripMenuItem.Click += new System.EventHandler(this.loadstate6toolStripMenuItem_Click);
-			// 
-			// loadstate7toolStripMenuItem
-			// 
-			this.loadstate7toolStripMenuItem.Name = "loadstate7toolStripMenuItem";
-			this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.loadstate7toolStripMenuItem.Text = "7";
-			this.loadstate7toolStripMenuItem.Click += new System.EventHandler(this.loadstate7toolStripMenuItem_Click);
-			// 
-			// loadstate8toolStripMenuItem
-			// 
-			this.loadstate8toolStripMenuItem.Name = "loadstate8toolStripMenuItem";
-			this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.loadstate8toolStripMenuItem.Text = "8";
-			this.loadstate8toolStripMenuItem.Click += new System.EventHandler(this.loadstate8toolStripMenuItem_Click);
-			// 
-			// loadstate9toolStripMenuItem
-			// 
-			this.loadstate9toolStripMenuItem.Name = "loadstate9toolStripMenuItem";
-			this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.loadstate9toolStripMenuItem.Text = "9";
-			this.loadstate9toolStripMenuItem.Click += new System.EventHandler(this.loadstate9toolStripMenuItem_Click);
-			// 
-			// loadstate0toolStripMenuItem
-			// 
-			this.loadstate0toolStripMenuItem.Name = "loadstate0toolStripMenuItem";
-			this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.loadstate0toolStripMenuItem.Text = "0";
-			this.loadstate0toolStripMenuItem.Click += new System.EventHandler(this.loadstate0toolStripMenuItem_Click);
-			// 
-			// toolStripSeparator7
-			// 
-			this.toolStripSeparator7.Name = "toolStripSeparator7";
-			this.toolStripSeparator7.Size = new System.Drawing.Size(171, 6);
-			// 
-			// loadNamedStateToolStripMenuItem
-			// 
-			this.loadNamedStateToolStripMenuItem.Name = "loadNamedStateToolStripMenuItem";
-			this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.loadNamedStateToolStripMenuItem.Text = "Load Named State...";
-			this.loadNamedStateToolStripMenuItem.Click += new System.EventHandler(this.loadNamedStateToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator21
-			// 
-			this.toolStripSeparator21.Name = "toolStripSeparator21";
-			this.toolStripSeparator21.Size = new System.Drawing.Size(171, 6);
-			// 
-			// autoLoadLastSlotToolStripMenuItem
-			// 
-			this.autoLoadLastSlotToolStripMenuItem.Name = "autoLoadLastSlotToolStripMenuItem";
-			this.autoLoadLastSlotToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.autoLoadLastSlotToolStripMenuItem.Text = "AutoLoad last Slot";
-			this.autoLoadLastSlotToolStripMenuItem.Click += new System.EventHandler(this.autoLoadLastSlotToolStripMenuItem_Click);
-			// 
-			// saveSlotToolStripMenuItem
-			// 
-			this.saveSlotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem";
+            this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
+            this.loadStateToolStripMenuItem.Text = "Load State";
+            this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened);
+            // 
+            // loadstate1toolStripMenuItem
+            // 
+            this.loadstate1toolStripMenuItem.Name = "loadstate1toolStripMenuItem";
+            this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.loadstate1toolStripMenuItem.Text = "1";
+            this.loadstate1toolStripMenuItem.Click += new System.EventHandler(this.loadstate1toolStripMenuItem_Click);
+            // 
+            // loadstate2toolStripMenuItem
+            // 
+            this.loadstate2toolStripMenuItem.Name = "loadstate2toolStripMenuItem";
+            this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.loadstate2toolStripMenuItem.Text = "2";
+            this.loadstate2toolStripMenuItem.Click += new System.EventHandler(this.loadstate2toolStripMenuItem_Click);
+            // 
+            // loadstate3toolStripMenuItem
+            // 
+            this.loadstate3toolStripMenuItem.Name = "loadstate3toolStripMenuItem";
+            this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.loadstate3toolStripMenuItem.Text = "3";
+            this.loadstate3toolStripMenuItem.Click += new System.EventHandler(this.loadstate3toolStripMenuItem_Click);
+            // 
+            // loadstate4toolStripMenuItem
+            // 
+            this.loadstate4toolStripMenuItem.Name = "loadstate4toolStripMenuItem";
+            this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.loadstate4toolStripMenuItem.Text = "4";
+            this.loadstate4toolStripMenuItem.Click += new System.EventHandler(this.loadstate4toolStripMenuItem_Click);
+            // 
+            // loadstate5toolStripMenuItem
+            // 
+            this.loadstate5toolStripMenuItem.Name = "loadstate5toolStripMenuItem";
+            this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.loadstate5toolStripMenuItem.Text = "5";
+            this.loadstate5toolStripMenuItem.Click += new System.EventHandler(this.loadstate5toolStripMenuItem_Click);
+            // 
+            // loadstate6toolStripMenuItem
+            // 
+            this.loadstate6toolStripMenuItem.Name = "loadstate6toolStripMenuItem";
+            this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.loadstate6toolStripMenuItem.Text = "6";
+            this.loadstate6toolStripMenuItem.Click += new System.EventHandler(this.loadstate6toolStripMenuItem_Click);
+            // 
+            // loadstate7toolStripMenuItem
+            // 
+            this.loadstate7toolStripMenuItem.Name = "loadstate7toolStripMenuItem";
+            this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.loadstate7toolStripMenuItem.Text = "7";
+            this.loadstate7toolStripMenuItem.Click += new System.EventHandler(this.loadstate7toolStripMenuItem_Click);
+            // 
+            // loadstate8toolStripMenuItem
+            // 
+            this.loadstate8toolStripMenuItem.Name = "loadstate8toolStripMenuItem";
+            this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.loadstate8toolStripMenuItem.Text = "8";
+            this.loadstate8toolStripMenuItem.Click += new System.EventHandler(this.loadstate8toolStripMenuItem_Click);
+            // 
+            // loadstate9toolStripMenuItem
+            // 
+            this.loadstate9toolStripMenuItem.Name = "loadstate9toolStripMenuItem";
+            this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.loadstate9toolStripMenuItem.Text = "9";
+            this.loadstate9toolStripMenuItem.Click += new System.EventHandler(this.loadstate9toolStripMenuItem_Click);
+            // 
+            // loadstate0toolStripMenuItem
+            // 
+            this.loadstate0toolStripMenuItem.Name = "loadstate0toolStripMenuItem";
+            this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.loadstate0toolStripMenuItem.Text = "0";
+            this.loadstate0toolStripMenuItem.Click += new System.EventHandler(this.loadstate0toolStripMenuItem_Click);
+            // 
+            // toolStripSeparator7
+            // 
+            this.toolStripSeparator7.Name = "toolStripSeparator7";
+            this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
+            // 
+            // loadNamedStateToolStripMenuItem
+            // 
+            this.loadNamedStateToolStripMenuItem.Name = "loadNamedStateToolStripMenuItem";
+            this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.loadNamedStateToolStripMenuItem.Text = "Load Named State...";
+            this.loadNamedStateToolStripMenuItem.Click += new System.EventHandler(this.loadNamedStateToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator21
+            // 
+            this.toolStripSeparator21.Name = "toolStripSeparator21";
+            this.toolStripSeparator21.Size = new System.Drawing.Size(177, 6);
+            // 
+            // autoLoadLastSlotToolStripMenuItem
+            // 
+            this.autoLoadLastSlotToolStripMenuItem.Name = "autoLoadLastSlotToolStripMenuItem";
+            this.autoLoadLastSlotToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.autoLoadLastSlotToolStripMenuItem.Text = "AutoLoad last Slot";
+            this.autoLoadLastSlotToolStripMenuItem.Click += new System.EventHandler(this.autoLoadLastSlotToolStripMenuItem_Click);
+            // 
+            // saveSlotToolStripMenuItem
+            // 
+            this.saveSlotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.selectSlot10ToolStripMenuItem,
             this.selectSlot1ToolStripMenuItem,
             this.selectSlot2ToolStripMenuItem,
@@ -612,124 +612,124 @@
             this.toolStripSeparator5,
             this.saveToCurrentSlotToolStripMenuItem,
             this.loadCurrentSlotToolStripMenuItem});
-			this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem";
-			this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
-			this.saveSlotToolStripMenuItem.Text = "SaveSlot";
-			this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened);
-			// 
-			// selectSlot10ToolStripMenuItem
-			// 
-			this.selectSlot10ToolStripMenuItem.Name = "selectSlot10ToolStripMenuItem";
-			this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.selectSlot10ToolStripMenuItem.Text = "Select Slot 0";
-			this.selectSlot10ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot10ToolStripMenuItem_Click);
-			// 
-			// selectSlot1ToolStripMenuItem
-			// 
-			this.selectSlot1ToolStripMenuItem.Name = "selectSlot1ToolStripMenuItem";
-			this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.selectSlot1ToolStripMenuItem.Text = "Select Slot 1";
-			this.selectSlot1ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot1ToolStripMenuItem_Click);
-			// 
-			// selectSlot2ToolStripMenuItem
-			// 
-			this.selectSlot2ToolStripMenuItem.Name = "selectSlot2ToolStripMenuItem";
-			this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.selectSlot2ToolStripMenuItem.Text = "Select Slot 2";
-			this.selectSlot2ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot2ToolStripMenuItem_Click);
-			// 
-			// selectSlot3ToolStripMenuItem
-			// 
-			this.selectSlot3ToolStripMenuItem.Name = "selectSlot3ToolStripMenuItem";
-			this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.selectSlot3ToolStripMenuItem.Text = "Select Slot 3";
-			this.selectSlot3ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot3ToolStripMenuItem_Click);
-			// 
-			// selectSlot4ToolStripMenuItem
-			// 
-			this.selectSlot4ToolStripMenuItem.Name = "selectSlot4ToolStripMenuItem";
-			this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.selectSlot4ToolStripMenuItem.Text = "Select Slot 4";
-			this.selectSlot4ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot4ToolStripMenuItem_Click);
-			// 
-			// selectSlot5ToolStripMenuItem
-			// 
-			this.selectSlot5ToolStripMenuItem.Name = "selectSlot5ToolStripMenuItem";
-			this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.selectSlot5ToolStripMenuItem.Text = "Select Slot 5";
-			this.selectSlot5ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot5ToolStripMenuItem_Click);
-			// 
-			// selectSlot6ToolStripMenuItem
-			// 
-			this.selectSlot6ToolStripMenuItem.Name = "selectSlot6ToolStripMenuItem";
-			this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.selectSlot6ToolStripMenuItem.Text = "Select Slot 6";
-			this.selectSlot6ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot6ToolStripMenuItem_Click);
-			// 
-			// selectSlot7ToolStripMenuItem
-			// 
-			this.selectSlot7ToolStripMenuItem.Name = "selectSlot7ToolStripMenuItem";
-			this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.selectSlot7ToolStripMenuItem.Text = "Select Slot 7";
-			this.selectSlot7ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot7ToolStripMenuItem_Click);
-			// 
-			// selectSlot8ToolStripMenuItem
-			// 
-			this.selectSlot8ToolStripMenuItem.Name = "selectSlot8ToolStripMenuItem";
-			this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.selectSlot8ToolStripMenuItem.Text = "Select Slot 8";
-			this.selectSlot8ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot8ToolStripMenuItem_Click);
-			// 
-			// selectSlot9ToolStripMenuItem
-			// 
-			this.selectSlot9ToolStripMenuItem.Name = "selectSlot9ToolStripMenuItem";
-			this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.selectSlot9ToolStripMenuItem.Text = "Select Slot 9";
-			this.selectSlot9ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot9ToolStripMenuItem_Click);
-			// 
-			// previousSlotToolStripMenuItem
-			// 
-			this.previousSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveLeft;
-			this.previousSlotToolStripMenuItem.Name = "previousSlotToolStripMenuItem";
-			this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.previousSlotToolStripMenuItem.Text = "Previous Slot";
-			this.previousSlotToolStripMenuItem.Click += new System.EventHandler(this.previousSlotToolStripMenuItem_Click);
-			// 
-			// nextSlotToolStripMenuItem
-			// 
-			this.nextSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveRight;
-			this.nextSlotToolStripMenuItem.Name = "nextSlotToolStripMenuItem";
-			this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.nextSlotToolStripMenuItem.Text = "Next Slot";
-			this.nextSlotToolStripMenuItem.Click += new System.EventHandler(this.nextSlotToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator5
-			// 
-			this.toolStripSeparator5.Name = "toolStripSeparator5";
-			this.toolStripSeparator5.Size = new System.Drawing.Size(169, 6);
-			// 
-			// saveToCurrentSlotToolStripMenuItem
-			// 
-			this.saveToCurrentSlotToolStripMenuItem.Name = "saveToCurrentSlotToolStripMenuItem";
-			this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.saveToCurrentSlotToolStripMenuItem.Text = "Save to Current Slot";
-			this.saveToCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.saveToCurrentSlotToolStripMenuItem_Click);
-			// 
-			// loadCurrentSlotToolStripMenuItem
-			// 
-			this.loadCurrentSlotToolStripMenuItem.Name = "loadCurrentSlotToolStripMenuItem";
-			this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.loadCurrentSlotToolStripMenuItem.Text = "Load Current Slot";
-			this.loadCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.loadCurrentSlotToolStripMenuItem_Click);
-			// 
-			// toolStripMenuItem2
-			// 
-			this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-			this.toolStripMenuItem2.Size = new System.Drawing.Size(131, 6);
-			// 
-			// movieToolStripMenuItem
-			// 
-			this.movieToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem";
+            this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
+            this.saveSlotToolStripMenuItem.Text = "SaveSlot";
+            this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened);
+            // 
+            // selectSlot10ToolStripMenuItem
+            // 
+            this.selectSlot10ToolStripMenuItem.Name = "selectSlot10ToolStripMenuItem";
+            this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot10ToolStripMenuItem.Text = "Select Slot 0";
+            this.selectSlot10ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot10ToolStripMenuItem_Click);
+            // 
+            // selectSlot1ToolStripMenuItem
+            // 
+            this.selectSlot1ToolStripMenuItem.Name = "selectSlot1ToolStripMenuItem";
+            this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot1ToolStripMenuItem.Text = "Select Slot 1";
+            this.selectSlot1ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot1ToolStripMenuItem_Click);
+            // 
+            // selectSlot2ToolStripMenuItem
+            // 
+            this.selectSlot2ToolStripMenuItem.Name = "selectSlot2ToolStripMenuItem";
+            this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot2ToolStripMenuItem.Text = "Select Slot 2";
+            this.selectSlot2ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot2ToolStripMenuItem_Click);
+            // 
+            // selectSlot3ToolStripMenuItem
+            // 
+            this.selectSlot3ToolStripMenuItem.Name = "selectSlot3ToolStripMenuItem";
+            this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot3ToolStripMenuItem.Text = "Select Slot 3";
+            this.selectSlot3ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot3ToolStripMenuItem_Click);
+            // 
+            // selectSlot4ToolStripMenuItem
+            // 
+            this.selectSlot4ToolStripMenuItem.Name = "selectSlot4ToolStripMenuItem";
+            this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot4ToolStripMenuItem.Text = "Select Slot 4";
+            this.selectSlot4ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot4ToolStripMenuItem_Click);
+            // 
+            // selectSlot5ToolStripMenuItem
+            // 
+            this.selectSlot5ToolStripMenuItem.Name = "selectSlot5ToolStripMenuItem";
+            this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot5ToolStripMenuItem.Text = "Select Slot 5";
+            this.selectSlot5ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot5ToolStripMenuItem_Click);
+            // 
+            // selectSlot6ToolStripMenuItem
+            // 
+            this.selectSlot6ToolStripMenuItem.Name = "selectSlot6ToolStripMenuItem";
+            this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot6ToolStripMenuItem.Text = "Select Slot 6";
+            this.selectSlot6ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot6ToolStripMenuItem_Click);
+            // 
+            // selectSlot7ToolStripMenuItem
+            // 
+            this.selectSlot7ToolStripMenuItem.Name = "selectSlot7ToolStripMenuItem";
+            this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot7ToolStripMenuItem.Text = "Select Slot 7";
+            this.selectSlot7ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot7ToolStripMenuItem_Click);
+            // 
+            // selectSlot8ToolStripMenuItem
+            // 
+            this.selectSlot8ToolStripMenuItem.Name = "selectSlot8ToolStripMenuItem";
+            this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot8ToolStripMenuItem.Text = "Select Slot 8";
+            this.selectSlot8ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot8ToolStripMenuItem_Click);
+            // 
+            // selectSlot9ToolStripMenuItem
+            // 
+            this.selectSlot9ToolStripMenuItem.Name = "selectSlot9ToolStripMenuItem";
+            this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot9ToolStripMenuItem.Text = "Select Slot 9";
+            this.selectSlot9ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot9ToolStripMenuItem_Click);
+            // 
+            // previousSlotToolStripMenuItem
+            // 
+            this.previousSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveLeft;
+            this.previousSlotToolStripMenuItem.Name = "previousSlotToolStripMenuItem";
+            this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.previousSlotToolStripMenuItem.Text = "Previous Slot";
+            this.previousSlotToolStripMenuItem.Click += new System.EventHandler(this.previousSlotToolStripMenuItem_Click);
+            // 
+            // nextSlotToolStripMenuItem
+            // 
+            this.nextSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveRight;
+            this.nextSlotToolStripMenuItem.Name = "nextSlotToolStripMenuItem";
+            this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.nextSlotToolStripMenuItem.Text = "Next Slot";
+            this.nextSlotToolStripMenuItem.Click += new System.EventHandler(this.nextSlotToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator5
+            // 
+            this.toolStripSeparator5.Name = "toolStripSeparator5";
+            this.toolStripSeparator5.Size = new System.Drawing.Size(175, 6);
+            // 
+            // saveToCurrentSlotToolStripMenuItem
+            // 
+            this.saveToCurrentSlotToolStripMenuItem.Name = "saveToCurrentSlotToolStripMenuItem";
+            this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.saveToCurrentSlotToolStripMenuItem.Text = "Save to Current Slot";
+            this.saveToCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.saveToCurrentSlotToolStripMenuItem_Click);
+            // 
+            // loadCurrentSlotToolStripMenuItem
+            // 
+            this.loadCurrentSlotToolStripMenuItem.Name = "loadCurrentSlotToolStripMenuItem";
+            this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.loadCurrentSlotToolStripMenuItem.Text = "Load Current Slot";
+            this.loadCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.loadCurrentSlotToolStripMenuItem_Click);
+            // 
+            // toolStripMenuItem2
+            // 
+            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(137, 6);
+            // 
+            // movieToolStripMenuItem
+            // 
+            this.movieToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.readonlyToolStripMenuItem,
             this.toolStripSeparator15,
             this.recentToolStripMenuItem,
@@ -741,257 +741,257 @@
             this.toolStripSeparator14,
             this.bindSavestatesToMoviesToolStripMenuItem,
             this.automaticallyBackupMoviesToolStripMenuItem});
-			this.movieToolStripMenuItem.Name = "movieToolStripMenuItem";
-			this.movieToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
-			this.movieToolStripMenuItem.Text = "Movie";
-			this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened);
-			// 
-			// readonlyToolStripMenuItem
-			// 
-			this.readonlyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly;
-			this.readonlyToolStripMenuItem.Name = "readonlyToolStripMenuItem";
-			this.readonlyToolStripMenuItem.Size = new System.Drawing.Size(211, 22);
-			this.readonlyToolStripMenuItem.Text = "Read-only";
-			this.readonlyToolStripMenuItem.Click += new System.EventHandler(this.readonlyToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator15
-			// 
-			this.toolStripSeparator15.Name = "toolStripSeparator15";
-			this.toolStripSeparator15.Size = new System.Drawing.Size(208, 6);
-			// 
-			// recentToolStripMenuItem
-			// 
-			this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.movieToolStripMenuItem.Name = "movieToolStripMenuItem";
+            this.movieToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
+            this.movieToolStripMenuItem.Text = "Movie";
+            this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened);
+            // 
+            // readonlyToolStripMenuItem
+            // 
+            this.readonlyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly;
+            this.readonlyToolStripMenuItem.Name = "readonlyToolStripMenuItem";
+            this.readonlyToolStripMenuItem.Size = new System.Drawing.Size(231, 22);
+            this.readonlyToolStripMenuItem.Text = "Read-only";
+            this.readonlyToolStripMenuItem.Click += new System.EventHandler(this.readonlyToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator15
+            // 
+            this.toolStripSeparator15.Name = "toolStripSeparator15";
+            this.toolStripSeparator15.Size = new System.Drawing.Size(228, 6);
+            // 
+            // recentToolStripMenuItem
+            // 
+            this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.noneToolStripMenuItem1,
             this.toolStripSeparator16,
             this.clearToolStripMenuItem1,
             this.autoloadMostRecentToolStripMenuItem1});
-			this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
-			this.recentToolStripMenuItem.Name = "recentToolStripMenuItem";
-			this.recentToolStripMenuItem.Size = new System.Drawing.Size(211, 22);
-			this.recentToolStripMenuItem.Text = "Recent";
-			this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened);
-			// 
-			// noneToolStripMenuItem1
-			// 
-			this.noneToolStripMenuItem1.Name = "noneToolStripMenuItem1";
-			this.noneToolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
-			this.noneToolStripMenuItem1.Text = "None";
-			// 
-			// toolStripSeparator16
-			// 
-			this.toolStripSeparator16.Name = "toolStripSeparator16";
-			this.toolStripSeparator16.Size = new System.Drawing.Size(177, 6);
-			// 
-			// clearToolStripMenuItem1
-			// 
-			this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1";
-			this.clearToolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
-			this.clearToolStripMenuItem1.Text = "Clear";
-			// 
-			// autoloadMostRecentToolStripMenuItem1
-			// 
-			this.autoloadMostRecentToolStripMenuItem1.Name = "autoloadMostRecentToolStripMenuItem1";
-			this.autoloadMostRecentToolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
-			this.autoloadMostRecentToolStripMenuItem1.Text = "&Autoload Most Recent";
-			// 
-			// recordMovieToolStripMenuItem
-			// 
-			this.recordMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS;
-			this.recordMovieToolStripMenuItem.Name = "recordMovieToolStripMenuItem";
-			this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(211, 22);
-			this.recordMovieToolStripMenuItem.Text = "&Record Movie...";
-			this.recordMovieToolStripMenuItem.Click += new System.EventHandler(this.recordMovieToolStripMenuItem_Click);
-			// 
-			// playMovieToolStripMenuItem
-			// 
-			this.playMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Play;
-			this.playMovieToolStripMenuItem.Name = "playMovieToolStripMenuItem";
-			this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(211, 22);
-			this.playMovieToolStripMenuItem.Text = "&Play Movie...";
-			this.playMovieToolStripMenuItem.Click += new System.EventHandler(this.playMovieToolStripMenuItem_Click);
-			// 
-			// stopMovieToolStripMenuItem
-			// 
-			this.stopMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
-			this.stopMovieToolStripMenuItem.Name = "stopMovieToolStripMenuItem";
-			this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(211, 22);
-			this.stopMovieToolStripMenuItem.Text = "Stop Movie";
-			this.stopMovieToolStripMenuItem.Click += new System.EventHandler(this.stopMovieToolStripMenuItem_Click);
-			// 
-			// playFromBeginningToolStripMenuItem
-			// 
-			this.playFromBeginningToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart;
-			this.playFromBeginningToolStripMenuItem.Name = "playFromBeginningToolStripMenuItem";
-			this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(211, 22);
-			this.playFromBeginningToolStripMenuItem.Text = "Play from Beginning";
-			this.playFromBeginningToolStripMenuItem.Click += new System.EventHandler(this.playFromBeginningToolStripMenuItem_Click);
-			// 
-			// importMovieToolStripMenuItem
-			// 
-			this.importMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Import;
-			this.importMovieToolStripMenuItem.Name = "importMovieToolStripMenuItem";
-			this.importMovieToolStripMenuItem.Size = new System.Drawing.Size(211, 22);
-			this.importMovieToolStripMenuItem.Text = "Import Movies...";
-			this.importMovieToolStripMenuItem.Click += new System.EventHandler(this.importMovieToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator14
-			// 
-			this.toolStripSeparator14.Name = "toolStripSeparator14";
-			this.toolStripSeparator14.Size = new System.Drawing.Size(208, 6);
-			// 
-			// bindSavestatesToMoviesToolStripMenuItem
-			// 
-			this.bindSavestatesToMoviesToolStripMenuItem.Name = "bindSavestatesToMoviesToolStripMenuItem";
-			this.bindSavestatesToMoviesToolStripMenuItem.Size = new System.Drawing.Size(211, 22);
-			this.bindSavestatesToMoviesToolStripMenuItem.Text = "Bind Savestates to Movies";
-			this.bindSavestatesToMoviesToolStripMenuItem.Click += new System.EventHandler(this.bindSavestatesToMoviesToolStripMenuItem_Click);
-			// 
-			// automaticallyBackupMoviesToolStripMenuItem
-			// 
-			this.automaticallyBackupMoviesToolStripMenuItem.Name = "automaticallyBackupMoviesToolStripMenuItem";
-			this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(211, 22);
-			this.automaticallyBackupMoviesToolStripMenuItem.Text = "Automatically Backup Movies";
-			this.automaticallyBackupMoviesToolStripMenuItem.Click += new System.EventHandler(this.automaticallyBackupMoviesToolStripMenuItem_Click);
-			// 
-			// aVIWAVToolStripMenuItem
-			// 
-			this.aVIWAVToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
+            this.recentToolStripMenuItem.Name = "recentToolStripMenuItem";
+            this.recentToolStripMenuItem.Size = new System.Drawing.Size(231, 22);
+            this.recentToolStripMenuItem.Text = "Recent";
+            this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened);
+            // 
+            // noneToolStripMenuItem1
+            // 
+            this.noneToolStripMenuItem1.Name = "noneToolStripMenuItem1";
+            this.noneToolStripMenuItem1.Size = new System.Drawing.Size(192, 22);
+            this.noneToolStripMenuItem1.Text = "None";
+            // 
+            // toolStripSeparator16
+            // 
+            this.toolStripSeparator16.Name = "toolStripSeparator16";
+            this.toolStripSeparator16.Size = new System.Drawing.Size(189, 6);
+            // 
+            // clearToolStripMenuItem1
+            // 
+            this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1";
+            this.clearToolStripMenuItem1.Size = new System.Drawing.Size(192, 22);
+            this.clearToolStripMenuItem1.Text = "Clear";
+            // 
+            // autoloadMostRecentToolStripMenuItem1
+            // 
+            this.autoloadMostRecentToolStripMenuItem1.Name = "autoloadMostRecentToolStripMenuItem1";
+            this.autoloadMostRecentToolStripMenuItem1.Size = new System.Drawing.Size(192, 22);
+            this.autoloadMostRecentToolStripMenuItem1.Text = "&Autoload Most Recent";
+            // 
+            // recordMovieToolStripMenuItem
+            // 
+            this.recordMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS;
+            this.recordMovieToolStripMenuItem.Name = "recordMovieToolStripMenuItem";
+            this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22);
+            this.recordMovieToolStripMenuItem.Text = "&Record Movie...";
+            this.recordMovieToolStripMenuItem.Click += new System.EventHandler(this.recordMovieToolStripMenuItem_Click);
+            // 
+            // playMovieToolStripMenuItem
+            // 
+            this.playMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Play;
+            this.playMovieToolStripMenuItem.Name = "playMovieToolStripMenuItem";
+            this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22);
+            this.playMovieToolStripMenuItem.Text = "&Play Movie...";
+            this.playMovieToolStripMenuItem.Click += new System.EventHandler(this.playMovieToolStripMenuItem_Click);
+            // 
+            // stopMovieToolStripMenuItem
+            // 
+            this.stopMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
+            this.stopMovieToolStripMenuItem.Name = "stopMovieToolStripMenuItem";
+            this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22);
+            this.stopMovieToolStripMenuItem.Text = "Stop Movie";
+            this.stopMovieToolStripMenuItem.Click += new System.EventHandler(this.stopMovieToolStripMenuItem_Click);
+            // 
+            // playFromBeginningToolStripMenuItem
+            // 
+            this.playFromBeginningToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart;
+            this.playFromBeginningToolStripMenuItem.Name = "playFromBeginningToolStripMenuItem";
+            this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(231, 22);
+            this.playFromBeginningToolStripMenuItem.Text = "Play from Beginning";
+            this.playFromBeginningToolStripMenuItem.Click += new System.EventHandler(this.playFromBeginningToolStripMenuItem_Click);
+            // 
+            // importMovieToolStripMenuItem
+            // 
+            this.importMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Import;
+            this.importMovieToolStripMenuItem.Name = "importMovieToolStripMenuItem";
+            this.importMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22);
+            this.importMovieToolStripMenuItem.Text = "Import Movies...";
+            this.importMovieToolStripMenuItem.Click += new System.EventHandler(this.importMovieToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator14
+            // 
+            this.toolStripSeparator14.Name = "toolStripSeparator14";
+            this.toolStripSeparator14.Size = new System.Drawing.Size(228, 6);
+            // 
+            // bindSavestatesToMoviesToolStripMenuItem
+            // 
+            this.bindSavestatesToMoviesToolStripMenuItem.Name = "bindSavestatesToMoviesToolStripMenuItem";
+            this.bindSavestatesToMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22);
+            this.bindSavestatesToMoviesToolStripMenuItem.Text = "Bind Savestates to Movies";
+            this.bindSavestatesToMoviesToolStripMenuItem.Click += new System.EventHandler(this.bindSavestatesToMoviesToolStripMenuItem_Click);
+            // 
+            // automaticallyBackupMoviesToolStripMenuItem
+            // 
+            this.automaticallyBackupMoviesToolStripMenuItem.Name = "automaticallyBackupMoviesToolStripMenuItem";
+            this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22);
+            this.automaticallyBackupMoviesToolStripMenuItem.Text = "Automatically Backup Movies";
+            this.automaticallyBackupMoviesToolStripMenuItem.Click += new System.EventHandler(this.automaticallyBackupMoviesToolStripMenuItem_Click);
+            // 
+            // aVIWAVToolStripMenuItem
+            // 
+            this.aVIWAVToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.recordAVIToolStripMenuItem,
             this.stopAVIToolStripMenuItem});
-			this.aVIWAVToolStripMenuItem.Name = "aVIWAVToolStripMenuItem";
-			this.aVIWAVToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
-			this.aVIWAVToolStripMenuItem.Text = "AVI/WAV";
-			this.aVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened);
-			// 
-			// recordAVIToolStripMenuItem
-			// 
-			this.recordAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI;
-			this.recordAVIToolStripMenuItem.Name = "recordAVIToolStripMenuItem";
-			this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(128, 22);
-			this.recordAVIToolStripMenuItem.Text = "Record AVI";
-			this.recordAVIToolStripMenuItem.Click += new System.EventHandler(this.recordAVIToolStripMenuItem_Click);
-			// 
-			// stopAVIToolStripMenuItem
-			// 
-			this.stopAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
-			this.stopAVIToolStripMenuItem.Name = "stopAVIToolStripMenuItem";
-			this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(128, 22);
-			this.stopAVIToolStripMenuItem.Text = "Stop AVI";
-			this.stopAVIToolStripMenuItem.Click += new System.EventHandler(this.stopAVIToolStripMenuItem_Click);
-			// 
-			// screenshotToolStripMenuItem
-			// 
-			this.screenshotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.aVIWAVToolStripMenuItem.Name = "aVIWAVToolStripMenuItem";
+            this.aVIWAVToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
+            this.aVIWAVToolStripMenuItem.Text = "AVI/WAV";
+            this.aVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened);
+            // 
+            // recordAVIToolStripMenuItem
+            // 
+            this.recordAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI;
+            this.recordAVIToolStripMenuItem.Name = "recordAVIToolStripMenuItem";
+            this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
+            this.recordAVIToolStripMenuItem.Text = "Record AVI";
+            this.recordAVIToolStripMenuItem.Click += new System.EventHandler(this.recordAVIToolStripMenuItem_Click);
+            // 
+            // stopAVIToolStripMenuItem
+            // 
+            this.stopAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
+            this.stopAVIToolStripMenuItem.Name = "stopAVIToolStripMenuItem";
+            this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
+            this.stopAVIToolStripMenuItem.Text = "Stop AVI";
+            this.stopAVIToolStripMenuItem.Click += new System.EventHandler(this.stopAVIToolStripMenuItem_Click);
+            // 
+            // screenshotToolStripMenuItem
+            // 
+            this.screenshotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.screenshotF12ToolStripMenuItem,
             this.screenshotAsToolStripMenuItem,
             this.screenshotClipboardToolStripMenuItem,
             this.animatedGIFConfigToolStripMenuItem,
             this.makeAnimatedGIFToolStripMenuItem,
             this.makeAnimatedGifAsToolStripMenuItem});
-			this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem";
-			this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
-			this.screenshotToolStripMenuItem.Text = "Screenshot";
-			// 
-			// screenshotF12ToolStripMenuItem
-			// 
-			this.screenshotF12ToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera;
-			this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem";
-			this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
-			this.screenshotF12ToolStripMenuItem.Text = "Screenshot";
-			this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click);
-			// 
-			// screenshotAsToolStripMenuItem
-			// 
-			this.screenshotAsToolStripMenuItem.Name = "screenshotAsToolStripMenuItem";
-			this.screenshotAsToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
-			this.screenshotAsToolStripMenuItem.Text = "Screenshot As...";
-			this.screenshotAsToolStripMenuItem.Click += new System.EventHandler(this.screenshotAsToolStripMenuItem_Click);
-			// 
-			// screenshotClipboardToolStripMenuItem
-			// 
-			this.screenshotClipboardToolStripMenuItem.Name = "screenshotClipboardToolStripMenuItem";
-			this.screenshotClipboardToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
-			this.screenshotClipboardToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
-			this.screenshotClipboardToolStripMenuItem.Text = "Screenshot -> Clipboard";
-			this.screenshotClipboardToolStripMenuItem.Click += new System.EventHandler(this.screenshotClipboardToolStripMenuItem_Click);
-			// 
-			// animatedGIFConfigToolStripMenuItem
-			// 
-			this.animatedGIFConfigToolStripMenuItem.Name = "animatedGIFConfigToolStripMenuItem";
-			this.animatedGIFConfigToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
-			this.animatedGIFConfigToolStripMenuItem.Text = "Animated GIF Config";
-			this.animatedGIFConfigToolStripMenuItem.Click += new System.EventHandler(this.animatedGIFConfigToolStripMenuItem_Click);
-			// 
-			// makeAnimatedGIFToolStripMenuItem
-			// 
-			this.makeAnimatedGIFToolStripMenuItem.Name = "makeAnimatedGIFToolStripMenuItem";
-			this.makeAnimatedGIFToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
-			this.makeAnimatedGIFToolStripMenuItem.Text = "Make Animated GIF";
-			this.makeAnimatedGIFToolStripMenuItem.Click += new System.EventHandler(this.makeAnimatedGIFToolStripMenuItem_Click);
-			// 
-			// makeAnimatedGifAsToolStripMenuItem
-			// 
-			this.makeAnimatedGifAsToolStripMenuItem.Name = "makeAnimatedGifAsToolStripMenuItem";
-			this.makeAnimatedGifAsToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
-			this.makeAnimatedGifAsToolStripMenuItem.Text = "Make Animated Gif As..";
-			this.makeAnimatedGifAsToolStripMenuItem.Click += new System.EventHandler(this.makeAnimatedGifAsToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator4
-			// 
-			this.toolStripSeparator4.Name = "toolStripSeparator4";
-			this.toolStripSeparator4.Size = new System.Drawing.Size(131, 6);
-			// 
-			// exitToolStripMenuItem
-			// 
-			this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
-			this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
-			this.exitToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
-			this.exitToolStripMenuItem.Text = "Exit";
-			this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
-			// 
-			// emulationToolStripMenuItem
-			// 
-			this.emulationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem";
+            this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
+            this.screenshotToolStripMenuItem.Text = "Screenshot";
+            // 
+            // screenshotF12ToolStripMenuItem
+            // 
+            this.screenshotF12ToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera;
+            this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem";
+            this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(245, 22);
+            this.screenshotF12ToolStripMenuItem.Text = "Screenshot";
+            this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click);
+            // 
+            // screenshotAsToolStripMenuItem
+            // 
+            this.screenshotAsToolStripMenuItem.Name = "screenshotAsToolStripMenuItem";
+            this.screenshotAsToolStripMenuItem.Size = new System.Drawing.Size(245, 22);
+            this.screenshotAsToolStripMenuItem.Text = "Screenshot As...";
+            this.screenshotAsToolStripMenuItem.Click += new System.EventHandler(this.screenshotAsToolStripMenuItem_Click);
+            // 
+            // screenshotClipboardToolStripMenuItem
+            // 
+            this.screenshotClipboardToolStripMenuItem.Name = "screenshotClipboardToolStripMenuItem";
+            this.screenshotClipboardToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
+            this.screenshotClipboardToolStripMenuItem.Size = new System.Drawing.Size(245, 22);
+            this.screenshotClipboardToolStripMenuItem.Text = "Screenshot -> Clipboard";
+            this.screenshotClipboardToolStripMenuItem.Click += new System.EventHandler(this.screenshotClipboardToolStripMenuItem_Click);
+            // 
+            // animatedGIFConfigToolStripMenuItem
+            // 
+            this.animatedGIFConfigToolStripMenuItem.Name = "animatedGIFConfigToolStripMenuItem";
+            this.animatedGIFConfigToolStripMenuItem.Size = new System.Drawing.Size(245, 22);
+            this.animatedGIFConfigToolStripMenuItem.Text = "Animated GIF Config";
+            this.animatedGIFConfigToolStripMenuItem.Click += new System.EventHandler(this.animatedGIFConfigToolStripMenuItem_Click);
+            // 
+            // makeAnimatedGIFToolStripMenuItem
+            // 
+            this.makeAnimatedGIFToolStripMenuItem.Name = "makeAnimatedGIFToolStripMenuItem";
+            this.makeAnimatedGIFToolStripMenuItem.Size = new System.Drawing.Size(245, 22);
+            this.makeAnimatedGIFToolStripMenuItem.Text = "Make Animated GIF";
+            this.makeAnimatedGIFToolStripMenuItem.Click += new System.EventHandler(this.makeAnimatedGIFToolStripMenuItem_Click);
+            // 
+            // makeAnimatedGifAsToolStripMenuItem
+            // 
+            this.makeAnimatedGifAsToolStripMenuItem.Name = "makeAnimatedGifAsToolStripMenuItem";
+            this.makeAnimatedGifAsToolStripMenuItem.Size = new System.Drawing.Size(245, 22);
+            this.makeAnimatedGifAsToolStripMenuItem.Text = "Make Animated Gif As..";
+            this.makeAnimatedGifAsToolStripMenuItem.Click += new System.EventHandler(this.makeAnimatedGifAsToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator4
+            // 
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
+            this.toolStripSeparator4.Size = new System.Drawing.Size(137, 6);
+            // 
+            // exitToolStripMenuItem
+            // 
+            this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
+            this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
+            this.exitToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
+            this.exitToolStripMenuItem.Text = "Exit";
+            this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
+            // 
+            // emulationToolStripMenuItem
+            // 
+            this.emulationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.pauseToolStripMenuItem,
             this.toolStripSeparator1,
             this.powerToolStripMenuItem,
             this.resetToolStripMenuItem});
-			this.emulationToolStripMenuItem.Name = "emulationToolStripMenuItem";
-			this.emulationToolStripMenuItem.Size = new System.Drawing.Size(65, 17);
-			this.emulationToolStripMenuItem.Text = "&Emulation";
-			this.emulationToolStripMenuItem.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened);
-			// 
-			// pauseToolStripMenuItem
-			// 
-			this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause;
-			this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem";
-			this.pauseToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
-			this.pauseToolStripMenuItem.Text = "&Pause";
-			this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator1
-			// 
-			this.toolStripSeparator1.Name = "toolStripSeparator1";
-			this.toolStripSeparator1.Size = new System.Drawing.Size(130, 6);
-			// 
-			// powerToolStripMenuItem
-			// 
-			this.powerToolStripMenuItem.Name = "powerToolStripMenuItem";
-			this.powerToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
-			this.powerToolStripMenuItem.Text = "Power Cycle";
-			this.powerToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click);
-			// 
-			// resetToolStripMenuItem
-			// 
-			this.resetToolStripMenuItem.Name = "resetToolStripMenuItem";
-			this.resetToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
-			this.resetToolStripMenuItem.Text = "&Reset";
-			this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click);
-			// 
-			// viewToolStripMenuItem
-			// 
-			this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.emulationToolStripMenuItem.Name = "emulationToolStripMenuItem";
+            this.emulationToolStripMenuItem.Size = new System.Drawing.Size(73, 19);
+            this.emulationToolStripMenuItem.Text = "&Emulation";
+            this.emulationToolStripMenuItem.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened);
+            // 
+            // pauseToolStripMenuItem
+            // 
+            this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause;
+            this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem";
+            this.pauseToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.pauseToolStripMenuItem.Text = "&Pause";
+            this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(136, 6);
+            // 
+            // powerToolStripMenuItem
+            // 
+            this.powerToolStripMenuItem.Name = "powerToolStripMenuItem";
+            this.powerToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.powerToolStripMenuItem.Text = "Power Cycle";
+            this.powerToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click);
+            // 
+            // resetToolStripMenuItem
+            // 
+            this.resetToolStripMenuItem.Name = "resetToolStripMenuItem";
+            this.resetToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.resetToolStripMenuItem.Text = "&Reset";
+            this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click);
+            // 
+            // viewToolStripMenuItem
+            // 
+            this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.windowSizeMenuItem,
             this.switchToFullscreenToolStripMenuItem,
             this.toolStripSeparator2,
@@ -1004,143 +1004,143 @@
             this.toolStripMenuItem4,
             this.displayStatusBarToolStripMenuItem,
             this.displayLogWindowToolStripMenuItem});
-			this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
-			this.viewToolStripMenuItem.Size = new System.Drawing.Size(41, 17);
-			this.viewToolStripMenuItem.Text = "&View";
-			this.viewToolStripMenuItem.DropDownOpened += new System.EventHandler(this.viewToolStripMenuItem_DropDownOpened);
-			// 
-			// windowSizeMenuItem
-			// 
-			this.windowSizeMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
+            this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 19);
+            this.viewToolStripMenuItem.Text = "&View";
+            this.viewToolStripMenuItem.DropDownOpened += new System.EventHandler(this.viewToolStripMenuItem_DropDownOpened);
+            // 
+            // windowSizeMenuItem
+            // 
+            this.windowSizeMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.x1MenuItem,
             this.x2MenuItem,
             this.x3MenuItem,
             this.x4MenuItem,
             this.x5MenuItem,
             this.mzMenuItem});
-			this.windowSizeMenuItem.Name = "windowSizeMenuItem";
-			this.windowSizeMenuItem.Size = new System.Drawing.Size(187, 22);
-			this.windowSizeMenuItem.Text = "&Window Size";
-			// 
-			// 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.zoomMenuItem_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.zoomMenuItem_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.zoomMenuItem_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.zoomMenuItem_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.zoomMenuItem_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.zoomMenuItem_Click);
-			// 
-			// switchToFullscreenToolStripMenuItem
-			// 
-			this.switchToFullscreenToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Fullscreen;
-			this.switchToFullscreenToolStripMenuItem.Name = "switchToFullscreenToolStripMenuItem";
-			this.switchToFullscreenToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
-			this.switchToFullscreenToolStripMenuItem.Text = "Switch to Fullscreen";
-			this.switchToFullscreenToolStripMenuItem.Click += new System.EventHandler(this.switchToFullscreenToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator2
-			// 
-			this.toolStripSeparator2.Name = "toolStripSeparator2";
-			this.toolStripSeparator2.Size = new System.Drawing.Size(184, 6);
-			// 
-			// displayFPSToolStripMenuItem
-			// 
-			this.displayFPSToolStripMenuItem.Name = "displayFPSToolStripMenuItem";
-			this.displayFPSToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
-			this.displayFPSToolStripMenuItem.Text = "Display FPS";
-			this.displayFPSToolStripMenuItem.Click += new System.EventHandler(this.displayFPSToolStripMenuItem_Click);
-			// 
-			// displayFrameCounterToolStripMenuItem
-			// 
-			this.displayFrameCounterToolStripMenuItem.Name = "displayFrameCounterToolStripMenuItem";
-			this.displayFrameCounterToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
-			this.displayFrameCounterToolStripMenuItem.Text = "Display FrameCounter";
-			this.displayFrameCounterToolStripMenuItem.Click += new System.EventHandler(this.displayFrameCounterToolStripMenuItem_Click);
-			// 
-			// displayLagCounterToolStripMenuItem
-			// 
-			this.displayLagCounterToolStripMenuItem.Name = "displayLagCounterToolStripMenuItem";
-			this.displayLagCounterToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
-			this.displayLagCounterToolStripMenuItem.Text = "Display Lag Counter";
-			this.displayLagCounterToolStripMenuItem.Click += new System.EventHandler(this.displayLagCounterToolStripMenuItem_Click);
-			// 
-			// displayInputToolStripMenuItem
-			// 
-			this.displayInputToolStripMenuItem.Name = "displayInputToolStripMenuItem";
-			this.displayInputToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
-			this.displayInputToolStripMenuItem.Text = "Display Input";
-			this.displayInputToolStripMenuItem.Click += new System.EventHandler(this.displayInputToolStripMenuItem_Click);
-			// 
-			// displayRerecordCountToolStripMenuItem
-			// 
-			this.displayRerecordCountToolStripMenuItem.Name = "displayRerecordCountToolStripMenuItem";
-			this.displayRerecordCountToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
-			this.displayRerecordCountToolStripMenuItem.Text = "Display Rerecord Count";
-			this.displayRerecordCountToolStripMenuItem.Click += new System.EventHandler(this.displayRerecordCountToolStripMenuItem_Click);
-			// 
-			// displaySubtitlesToolStripMenuItem
-			// 
-			this.displaySubtitlesToolStripMenuItem.Name = "displaySubtitlesToolStripMenuItem";
-			this.displaySubtitlesToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
-			this.displaySubtitlesToolStripMenuItem.Text = "Display Subtitles";
-			this.displaySubtitlesToolStripMenuItem.Click += new System.EventHandler(this.displaySubtitlesToolStripMenuItem_Click);
-			// 
-			// toolStripMenuItem4
-			// 
-			this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-			this.toolStripMenuItem4.Size = new System.Drawing.Size(184, 6);
-			// 
-			// displayStatusBarToolStripMenuItem
-			// 
-			this.displayStatusBarToolStripMenuItem.Name = "displayStatusBarToolStripMenuItem";
-			this.displayStatusBarToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
-			this.displayStatusBarToolStripMenuItem.Text = "Display Status Bar";
-			this.displayStatusBarToolStripMenuItem.Click += new System.EventHandler(this.displayStatusBarToolStripMenuItem_Click);
-			// 
-			// displayLogWindowToolStripMenuItem
-			// 
-			this.displayLogWindowToolStripMenuItem.Name = "displayLogWindowToolStripMenuItem";
-			this.displayLogWindowToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
-			this.displayLogWindowToolStripMenuItem.Text = "Display Log Window";
-			this.displayLogWindowToolStripMenuItem.Click += new System.EventHandler(this.displayLogWindowToolStripMenuItem_Click);
-			// 
-			// configToolStripMenuItem
-			// 
-			this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.windowSizeMenuItem.Name = "windowSizeMenuItem";
+            this.windowSizeMenuItem.Size = new System.Drawing.Size(198, 22);
+            this.windowSizeMenuItem.Text = "&Window Size";
+            // 
+            // 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.zoomMenuItem_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.zoomMenuItem_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.zoomMenuItem_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.zoomMenuItem_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.zoomMenuItem_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.zoomMenuItem_Click);
+            // 
+            // switchToFullscreenToolStripMenuItem
+            // 
+            this.switchToFullscreenToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Fullscreen;
+            this.switchToFullscreenToolStripMenuItem.Name = "switchToFullscreenToolStripMenuItem";
+            this.switchToFullscreenToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            this.switchToFullscreenToolStripMenuItem.Text = "Switch to Fullscreen";
+            this.switchToFullscreenToolStripMenuItem.Click += new System.EventHandler(this.switchToFullscreenToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(195, 6);
+            // 
+            // displayFPSToolStripMenuItem
+            // 
+            this.displayFPSToolStripMenuItem.Name = "displayFPSToolStripMenuItem";
+            this.displayFPSToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            this.displayFPSToolStripMenuItem.Text = "Display FPS";
+            this.displayFPSToolStripMenuItem.Click += new System.EventHandler(this.displayFPSToolStripMenuItem_Click);
+            // 
+            // displayFrameCounterToolStripMenuItem
+            // 
+            this.displayFrameCounterToolStripMenuItem.Name = "displayFrameCounterToolStripMenuItem";
+            this.displayFrameCounterToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            this.displayFrameCounterToolStripMenuItem.Text = "Display FrameCounter";
+            this.displayFrameCounterToolStripMenuItem.Click += new System.EventHandler(this.displayFrameCounterToolStripMenuItem_Click);
+            // 
+            // displayLagCounterToolStripMenuItem
+            // 
+            this.displayLagCounterToolStripMenuItem.Name = "displayLagCounterToolStripMenuItem";
+            this.displayLagCounterToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            this.displayLagCounterToolStripMenuItem.Text = "Display Lag Counter";
+            this.displayLagCounterToolStripMenuItem.Click += new System.EventHandler(this.displayLagCounterToolStripMenuItem_Click);
+            // 
+            // displayInputToolStripMenuItem
+            // 
+            this.displayInputToolStripMenuItem.Name = "displayInputToolStripMenuItem";
+            this.displayInputToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            this.displayInputToolStripMenuItem.Text = "Display Input";
+            this.displayInputToolStripMenuItem.Click += new System.EventHandler(this.displayInputToolStripMenuItem_Click);
+            // 
+            // displayRerecordCountToolStripMenuItem
+            // 
+            this.displayRerecordCountToolStripMenuItem.Name = "displayRerecordCountToolStripMenuItem";
+            this.displayRerecordCountToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            this.displayRerecordCountToolStripMenuItem.Text = "Display Rerecord Count";
+            this.displayRerecordCountToolStripMenuItem.Click += new System.EventHandler(this.displayRerecordCountToolStripMenuItem_Click);
+            // 
+            // displaySubtitlesToolStripMenuItem
+            // 
+            this.displaySubtitlesToolStripMenuItem.Name = "displaySubtitlesToolStripMenuItem";
+            this.displaySubtitlesToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            this.displaySubtitlesToolStripMenuItem.Text = "Display Subtitles";
+            this.displaySubtitlesToolStripMenuItem.Click += new System.EventHandler(this.displaySubtitlesToolStripMenuItem_Click);
+            // 
+            // toolStripMenuItem4
+            // 
+            this.toolStripMenuItem4.Name = "toolStripMenuItem4";
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(195, 6);
+            // 
+            // displayStatusBarToolStripMenuItem
+            // 
+            this.displayStatusBarToolStripMenuItem.Name = "displayStatusBarToolStripMenuItem";
+            this.displayStatusBarToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            this.displayStatusBarToolStripMenuItem.Text = "Display Status Bar";
+            this.displayStatusBarToolStripMenuItem.Click += new System.EventHandler(this.displayStatusBarToolStripMenuItem_Click);
+            // 
+            // displayLogWindowToolStripMenuItem
+            // 
+            this.displayLogWindowToolStripMenuItem.Name = "displayLogWindowToolStripMenuItem";
+            this.displayLogWindowToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            this.displayLogWindowToolStripMenuItem.Text = "Display Log Window";
+            this.displayLogWindowToolStripMenuItem.Click += new System.EventHandler(this.displayLogWindowToolStripMenuItem_Click);
+            // 
+            // configToolStripMenuItem
+            // 
+            this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.controllersToolStripMenuItem,
             this.hotkeysToolStripMenuItem,
             this.messagesToolStripMenuItem,
@@ -1153,66 +1153,66 @@
             this.toolStripSeparator10,
             this.saveConfigToolStripMenuItem,
             this.loadConfigToolStripMenuItem});
-			this.configToolStripMenuItem.Name = "configToolStripMenuItem";
-			this.configToolStripMenuItem.Size = new System.Drawing.Size(50, 17);
-			this.configToolStripMenuItem.Text = "&Config";
-			// 
-			// controllersToolStripMenuItem
-			// 
-			this.controllersToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController;
-			this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem";
-			this.controllersToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
-			this.controllersToolStripMenuItem.Text = "&Controllers...";
-			this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click);
-			// 
-			// hotkeysToolStripMenuItem
-			// 
-			this.hotkeysToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys;
-			this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem";
-			this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
-			this.hotkeysToolStripMenuItem.Text = "&Hotkeys...";
-			this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click);
-			// 
-			// messagesToolStripMenuItem
-			// 
-			this.messagesToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig;
-			this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem";
-			this.messagesToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
-			this.messagesToolStripMenuItem.Text = "&Messages...";
-			this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click);
-			// 
-			// pathsToolStripMenuItem
-			// 
-			this.pathsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS;
-			this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem";
-			this.pathsToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
-			this.pathsToolStripMenuItem.Text = "Paths...";
-			this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click);
-			// 
-			// soundToolStripMenuItem
-			// 
-			this.soundToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS;
-			this.soundToolStripMenuItem.Name = "soundToolStripMenuItem";
-			this.soundToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
-			this.soundToolStripMenuItem.Text = "&Sound...";
-			this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click);
-			// 
-			// autofireToolStripMenuItem
-			// 
-			this.autofireToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning;
-			this.autofireToolStripMenuItem.Name = "autofireToolStripMenuItem";
-			this.autofireToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
-			this.autofireToolStripMenuItem.Text = "&Autofire...";
-			this.autofireToolStripMenuItem.Click += new System.EventHandler(this.autofireToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator9
-			// 
-			this.toolStripSeparator9.Name = "toolStripSeparator9";
-			this.toolStripSeparator9.Size = new System.Drawing.Size(135, 6);
-			// 
-			// gUIToolStripMenuItem
-			// 
-			this.gUIToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.configToolStripMenuItem.Name = "configToolStripMenuItem";
+            this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 19);
+            this.configToolStripMenuItem.Text = "&Config";
+            // 
+            // controllersToolStripMenuItem
+            // 
+            this.controllersToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController;
+            this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem";
+            this.controllersToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+            this.controllersToolStripMenuItem.Text = "&Controllers...";
+            this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click);
+            // 
+            // hotkeysToolStripMenuItem
+            // 
+            this.hotkeysToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys;
+            this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem";
+            this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+            this.hotkeysToolStripMenuItem.Text = "&Hotkeys...";
+            this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click);
+            // 
+            // messagesToolStripMenuItem
+            // 
+            this.messagesToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig;
+            this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem";
+            this.messagesToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+            this.messagesToolStripMenuItem.Text = "&Messages...";
+            this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click);
+            // 
+            // pathsToolStripMenuItem
+            // 
+            this.pathsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS;
+            this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem";
+            this.pathsToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+            this.pathsToolStripMenuItem.Text = "Paths...";
+            this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click);
+            // 
+            // soundToolStripMenuItem
+            // 
+            this.soundToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS;
+            this.soundToolStripMenuItem.Name = "soundToolStripMenuItem";
+            this.soundToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+            this.soundToolStripMenuItem.Text = "&Sound...";
+            this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click);
+            // 
+            // autofireToolStripMenuItem
+            // 
+            this.autofireToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning;
+            this.autofireToolStripMenuItem.Name = "autofireToolStripMenuItem";
+            this.autofireToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+            this.autofireToolStripMenuItem.Text = "&Autofire...";
+            this.autofireToolStripMenuItem.Click += new System.EventHandler(this.autofireToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator9
+            // 
+            this.toolStripSeparator9.Name = "toolStripSeparator9";
+            this.toolStripSeparator9.Size = new System.Drawing.Size(138, 6);
+            // 
+            // gUIToolStripMenuItem
+            // 
+            this.gUIToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.pauseWhenMenuActivatedToolStripMenuItem,
             this.startPausedToolStripMenuItem,
             this.frameAdvanceSkipLagFramesToolStripMenuItem,
@@ -1231,135 +1231,135 @@
             this.saveScreenshotWithSavestatesToolStripMenuItem,
             this.toolStripSeparator23,
             this.logWindowAsConsoleToolStripMenuItem});
-			this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem";
-			this.gUIToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
-			this.gUIToolStripMenuItem.Text = "GUI";
-			this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened);
-			// 
-			// pauseWhenMenuActivatedToolStripMenuItem
-			// 
-			this.pauseWhenMenuActivatedToolStripMenuItem.Name = "pauseWhenMenuActivatedToolStripMenuItem";
-			this.pauseWhenMenuActivatedToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.pauseWhenMenuActivatedToolStripMenuItem.Text = "Pause when menu activated";
-			this.pauseWhenMenuActivatedToolStripMenuItem.Click += new System.EventHandler(this.pauseWhenMenuActivatedToolStripMenuItem_Click);
-			// 
-			// startPausedToolStripMenuItem
-			// 
-			this.startPausedToolStripMenuItem.Name = "startPausedToolStripMenuItem";
-			this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.startPausedToolStripMenuItem.Text = "Start paused";
-			this.startPausedToolStripMenuItem.Click += new System.EventHandler(this.startPausedToolStripMenuItem_Click);
-			// 
-			// frameAdvanceSkipLagFramesToolStripMenuItem
-			// 
-			this.frameAdvanceSkipLagFramesToolStripMenuItem.CheckOnClick = true;
-			this.frameAdvanceSkipLagFramesToolStripMenuItem.Name = "frameAdvanceSkipLagFramesToolStripMenuItem";
-			this.frameAdvanceSkipLagFramesToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.frameAdvanceSkipLagFramesToolStripMenuItem.Text = "Frame Advance - Skip Lag Frames";
-			this.frameAdvanceSkipLagFramesToolStripMenuItem.Click += new System.EventHandler(this.frameAdvanceSkipLagFramesToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator22
-			// 
-			this.toolStripSeparator22.Name = "toolStripSeparator22";
-			this.toolStripSeparator22.Size = new System.Drawing.Size(233, 6);
-			// 
-			// saveWindowPositionToolStripMenuItem
-			// 
-			this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem";
-			this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.saveWindowPositionToolStripMenuItem.Text = "Save window position";
-			this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click);
-			// 
-			// forceGDIPPresentationToolStripMenuItem
-			// 
-			this.forceGDIPPresentationToolStripMenuItem.Name = "forceGDIPPresentationToolStripMenuItem";
-			this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.forceGDIPPresentationToolStripMenuItem.Text = "Use GDI+ Display Method";
-			this.forceGDIPPresentationToolStripMenuItem.Click += new System.EventHandler(this.forceGDIPPresentationToolStripMenuItem_Click);
-			// 
-			// showMenuInFullScreenToolStripMenuItem
-			// 
-			this.showMenuInFullScreenToolStripMenuItem.Name = "showMenuInFullScreenToolStripMenuItem";
-			this.showMenuInFullScreenToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.showMenuInFullScreenToolStripMenuItem.Text = "Show Menu in Full Screen";
-			this.showMenuInFullScreenToolStripMenuItem.Click += new System.EventHandler(this.showMenuInFullScreenToolStripMenuItem_Click);
-			// 
-			// runInBackgroundToolStripMenuItem
-			// 
-			this.runInBackgroundToolStripMenuItem.Name = "runInBackgroundToolStripMenuItem";
-			this.runInBackgroundToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.runInBackgroundToolStripMenuItem.Text = "Run in Background";
-			this.runInBackgroundToolStripMenuItem.Click += new System.EventHandler(this.runInBackgroundToolStripMenuItem_Click);
-			// 
-			// acceptBackgroundInputToolStripMenuItem
-			// 
-			this.acceptBackgroundInputToolStripMenuItem.Name = "acceptBackgroundInputToolStripMenuItem";
-			this.acceptBackgroundInputToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.acceptBackgroundInputToolStripMenuItem.Text = "Accept Background Input";
-			this.acceptBackgroundInputToolStripMenuItem.Click += new System.EventHandler(this.acceptBackgroundInputToolStripMenuItem_Click);
-			// 
-			// singleInstanceModeToolStripMenuItem
-			// 
-			this.singleInstanceModeToolStripMenuItem.Name = "singleInstanceModeToolStripMenuItem";
-			this.singleInstanceModeToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.singleInstanceModeToolStripMenuItem.Text = "Single Instance Mode";
-			this.singleInstanceModeToolStripMenuItem.Click += new System.EventHandler(this.singleInstanceModeToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator24
-			// 
-			this.toolStripSeparator24.Name = "toolStripSeparator24";
-			this.toolStripSeparator24.Size = new System.Drawing.Size(233, 6);
-			// 
-			// enableRewindToolStripMenuItem
-			// 
-			this.enableRewindToolStripMenuItem.Name = "enableRewindToolStripMenuItem";
-			this.enableRewindToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.enableRewindToolStripMenuItem.Text = "&Enable Rewind";
-			this.enableRewindToolStripMenuItem.Click += new System.EventHandler(this.enableRewindToolStripMenuItem_Click);
-			// 
-			// enableContextMenuToolStripMenuItem
-			// 
-			this.enableContextMenuToolStripMenuItem.Name = "enableContextMenuToolStripMenuItem";
-			this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.enableContextMenuToolStripMenuItem.Text = "Enable Context Menu";
-			this.enableContextMenuToolStripMenuItem.Click += new System.EventHandler(this.enableContextMenuToolStripMenuItem_Click);
-			// 
-			// backupSavestatesToolStripMenuItem
-			// 
-			this.backupSavestatesToolStripMenuItem.Name = "backupSavestatesToolStripMenuItem";
-			this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.backupSavestatesToolStripMenuItem.Text = "Backup Savestates";
-			this.backupSavestatesToolStripMenuItem.Click += new System.EventHandler(this.backupSavestatesToolStripMenuItem_Click);
-			// 
-			// autoSavestatesToolStripMenuItem
-			// 
-			this.autoSavestatesToolStripMenuItem.Name = "autoSavestatesToolStripMenuItem";
-			this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.autoSavestatesToolStripMenuItem.Text = "Auto Savestates";
-			this.autoSavestatesToolStripMenuItem.Click += new System.EventHandler(this.autoSavestatesToolStripMenuItem_Click);
-			// 
-			// saveScreenshotWithSavestatesToolStripMenuItem
-			// 
-			this.saveScreenshotWithSavestatesToolStripMenuItem.Name = "saveScreenshotWithSavestatesToolStripMenuItem";
-			this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.saveScreenshotWithSavestatesToolStripMenuItem.Text = "Save Screenshot with Savestates";
-			this.saveScreenshotWithSavestatesToolStripMenuItem.Click += new System.EventHandler(this.screenshotWithSavestatesToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator23
-			// 
-			this.toolStripSeparator23.Name = "toolStripSeparator23";
-			this.toolStripSeparator23.Size = new System.Drawing.Size(233, 6);
-			// 
-			// logWindowAsConsoleToolStripMenuItem
-			// 
-			this.logWindowAsConsoleToolStripMenuItem.Name = "logWindowAsConsoleToolStripMenuItem";
-			this.logWindowAsConsoleToolStripMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.logWindowAsConsoleToolStripMenuItem.Text = "Log Window as Console";
-			this.logWindowAsConsoleToolStripMenuItem.Click += new System.EventHandler(this.logWindowAsConsoleToolStripMenuItem_Click);
-			// 
-			// frameSkipToolStripMenuItem
-			// 
-			this.frameSkipToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem";
+            this.gUIToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+            this.gUIToolStripMenuItem.Text = "GUI";
+            this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened);
+            // 
+            // pauseWhenMenuActivatedToolStripMenuItem
+            // 
+            this.pauseWhenMenuActivatedToolStripMenuItem.Name = "pauseWhenMenuActivatedToolStripMenuItem";
+            this.pauseWhenMenuActivatedToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.pauseWhenMenuActivatedToolStripMenuItem.Text = "Pause when menu activated";
+            this.pauseWhenMenuActivatedToolStripMenuItem.Click += new System.EventHandler(this.pauseWhenMenuActivatedToolStripMenuItem_Click);
+            // 
+            // startPausedToolStripMenuItem
+            // 
+            this.startPausedToolStripMenuItem.Name = "startPausedToolStripMenuItem";
+            this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.startPausedToolStripMenuItem.Text = "Start paused";
+            this.startPausedToolStripMenuItem.Click += new System.EventHandler(this.startPausedToolStripMenuItem_Click);
+            // 
+            // frameAdvanceSkipLagFramesToolStripMenuItem
+            // 
+            this.frameAdvanceSkipLagFramesToolStripMenuItem.CheckOnClick = true;
+            this.frameAdvanceSkipLagFramesToolStripMenuItem.Name = "frameAdvanceSkipLagFramesToolStripMenuItem";
+            this.frameAdvanceSkipLagFramesToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.frameAdvanceSkipLagFramesToolStripMenuItem.Text = "Frame Advance - Skip Lag Frames";
+            this.frameAdvanceSkipLagFramesToolStripMenuItem.Click += new System.EventHandler(this.frameAdvanceSkipLagFramesToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator22
+            // 
+            this.toolStripSeparator22.Name = "toolStripSeparator22";
+            this.toolStripSeparator22.Size = new System.Drawing.Size(249, 6);
+            // 
+            // saveWindowPositionToolStripMenuItem
+            // 
+            this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem";
+            this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.saveWindowPositionToolStripMenuItem.Text = "Save window position";
+            this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click);
+            // 
+            // forceGDIPPresentationToolStripMenuItem
+            // 
+            this.forceGDIPPresentationToolStripMenuItem.Name = "forceGDIPPresentationToolStripMenuItem";
+            this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.forceGDIPPresentationToolStripMenuItem.Text = "Use GDI+ Display Method";
+            this.forceGDIPPresentationToolStripMenuItem.Click += new System.EventHandler(this.forceGDIPPresentationToolStripMenuItem_Click);
+            // 
+            // showMenuInFullScreenToolStripMenuItem
+            // 
+            this.showMenuInFullScreenToolStripMenuItem.Name = "showMenuInFullScreenToolStripMenuItem";
+            this.showMenuInFullScreenToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.showMenuInFullScreenToolStripMenuItem.Text = "Show Menu in Full Screen";
+            this.showMenuInFullScreenToolStripMenuItem.Click += new System.EventHandler(this.showMenuInFullScreenToolStripMenuItem_Click);
+            // 
+            // runInBackgroundToolStripMenuItem
+            // 
+            this.runInBackgroundToolStripMenuItem.Name = "runInBackgroundToolStripMenuItem";
+            this.runInBackgroundToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.runInBackgroundToolStripMenuItem.Text = "Run in Background";
+            this.runInBackgroundToolStripMenuItem.Click += new System.EventHandler(this.runInBackgroundToolStripMenuItem_Click);
+            // 
+            // acceptBackgroundInputToolStripMenuItem
+            // 
+            this.acceptBackgroundInputToolStripMenuItem.Name = "acceptBackgroundInputToolStripMenuItem";
+            this.acceptBackgroundInputToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.acceptBackgroundInputToolStripMenuItem.Text = "Accept Background Input";
+            this.acceptBackgroundInputToolStripMenuItem.Click += new System.EventHandler(this.acceptBackgroundInputToolStripMenuItem_Click);
+            // 
+            // singleInstanceModeToolStripMenuItem
+            // 
+            this.singleInstanceModeToolStripMenuItem.Name = "singleInstanceModeToolStripMenuItem";
+            this.singleInstanceModeToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.singleInstanceModeToolStripMenuItem.Text = "Single Instance Mode";
+            this.singleInstanceModeToolStripMenuItem.Click += new System.EventHandler(this.singleInstanceModeToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator24
+            // 
+            this.toolStripSeparator24.Name = "toolStripSeparator24";
+            this.toolStripSeparator24.Size = new System.Drawing.Size(249, 6);
+            // 
+            // enableRewindToolStripMenuItem
+            // 
+            this.enableRewindToolStripMenuItem.Name = "enableRewindToolStripMenuItem";
+            this.enableRewindToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.enableRewindToolStripMenuItem.Text = "&Enable Rewind";
+            this.enableRewindToolStripMenuItem.Click += new System.EventHandler(this.enableRewindToolStripMenuItem_Click);
+            // 
+            // enableContextMenuToolStripMenuItem
+            // 
+            this.enableContextMenuToolStripMenuItem.Name = "enableContextMenuToolStripMenuItem";
+            this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.enableContextMenuToolStripMenuItem.Text = "Enable Context Menu";
+            this.enableContextMenuToolStripMenuItem.Click += new System.EventHandler(this.enableContextMenuToolStripMenuItem_Click);
+            // 
+            // backupSavestatesToolStripMenuItem
+            // 
+            this.backupSavestatesToolStripMenuItem.Name = "backupSavestatesToolStripMenuItem";
+            this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.backupSavestatesToolStripMenuItem.Text = "Backup Savestates";
+            this.backupSavestatesToolStripMenuItem.Click += new System.EventHandler(this.backupSavestatesToolStripMenuItem_Click);
+            // 
+            // autoSavestatesToolStripMenuItem
+            // 
+            this.autoSavestatesToolStripMenuItem.Name = "autoSavestatesToolStripMenuItem";
+            this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.autoSavestatesToolStripMenuItem.Text = "Auto Savestates";
+            this.autoSavestatesToolStripMenuItem.Click += new System.EventHandler(this.autoSavestatesToolStripMenuItem_Click);
+            // 
+            // saveScreenshotWithSavestatesToolStripMenuItem
+            // 
+            this.saveScreenshotWithSavestatesToolStripMenuItem.Name = "saveScreenshotWithSavestatesToolStripMenuItem";
+            this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.saveScreenshotWithSavestatesToolStripMenuItem.Text = "Save Screenshot with Savestates";
+            this.saveScreenshotWithSavestatesToolStripMenuItem.Click += new System.EventHandler(this.screenshotWithSavestatesToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator23
+            // 
+            this.toolStripSeparator23.Name = "toolStripSeparator23";
+            this.toolStripSeparator23.Size = new System.Drawing.Size(249, 6);
+            // 
+            // logWindowAsConsoleToolStripMenuItem
+            // 
+            this.logWindowAsConsoleToolStripMenuItem.Name = "logWindowAsConsoleToolStripMenuItem";
+            this.logWindowAsConsoleToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
+            this.logWindowAsConsoleToolStripMenuItem.Text = "Log Window as Console";
+            this.logWindowAsConsoleToolStripMenuItem.Click += new System.EventHandler(this.logWindowAsConsoleToolStripMenuItem_Click);
+            // 
+            // frameSkipToolStripMenuItem
+            // 
+            this.frameSkipToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.miLimitFramerate,
             this.miDisplayVsync,
             this.toolStripMenuItem3,
@@ -1380,170 +1380,170 @@
             this.miSpeed100,
             this.miSpeed150,
             this.miSpeed200});
-			this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem";
-			this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
-			this.frameSkipToolStripMenuItem.Text = "Speed/Skip";
-			this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened);
-			// 
-			// miLimitFramerate
-			// 
-			this.miLimitFramerate.Name = "miLimitFramerate";
-			this.miLimitFramerate.Size = new System.Drawing.Size(181, 22);
-			this.miLimitFramerate.Text = "Limit Framerate";
-			this.miLimitFramerate.Click += new System.EventHandler(this.miLimitFramerate_Click);
-			// 
-			// miDisplayVsync
-			// 
-			this.miDisplayVsync.Name = "miDisplayVsync";
-			this.miDisplayVsync.Size = new System.Drawing.Size(181, 22);
-			this.miDisplayVsync.Text = "Display VSync";
-			this.miDisplayVsync.Click += new System.EventHandler(this.miDisplayVsync_Click);
-			// 
-			// toolStripMenuItem3
-			// 
-			this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-			this.toolStripMenuItem3.Size = new System.Drawing.Size(178, 6);
-			// 
-			// miAutoMinimizeSkipping
-			// 
-			this.miAutoMinimizeSkipping.Name = "miAutoMinimizeSkipping";
-			this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(181, 22);
-			this.miAutoMinimizeSkipping.Text = "Auto-minimize skipping";
-			this.miAutoMinimizeSkipping.Click += new System.EventHandler(this.miAutoMinimizeSkipping_Click);
-			// 
-			// miFrameskip0
-			// 
-			this.miFrameskip0.Name = "miFrameskip0";
-			this.miFrameskip0.Size = new System.Drawing.Size(181, 22);
-			this.miFrameskip0.Text = "0 (never skip)";
-			this.miFrameskip0.Click += new System.EventHandler(this.miFrameskip0_Click);
-			// 
-			// miFrameskip1
-			// 
-			this.miFrameskip1.Name = "miFrameskip1";
-			this.miFrameskip1.Size = new System.Drawing.Size(181, 22);
-			this.miFrameskip1.Text = "1";
-			this.miFrameskip1.Click += new System.EventHandler(this.miFrameskip1_Click);
-			// 
-			// miFrameskip2
-			// 
-			this.miFrameskip2.Name = "miFrameskip2";
-			this.miFrameskip2.Size = new System.Drawing.Size(181, 22);
-			this.miFrameskip2.Text = "2";
-			this.miFrameskip2.Click += new System.EventHandler(this.miFrameskip2_Click);
-			// 
-			// miFrameskip3
-			// 
-			this.miFrameskip3.Name = "miFrameskip3";
-			this.miFrameskip3.Size = new System.Drawing.Size(181, 22);
-			this.miFrameskip3.Text = "3";
-			this.miFrameskip3.Click += new System.EventHandler(this.miFrameskip3_Click);
-			// 
-			// miFrameskip4
-			// 
-			this.miFrameskip4.Name = "miFrameskip4";
-			this.miFrameskip4.Size = new System.Drawing.Size(181, 22);
-			this.miFrameskip4.Text = "4";
-			this.miFrameskip4.Click += new System.EventHandler(this.miFrameskip4_Click);
-			// 
-			// miFrameskip5
-			// 
-			this.miFrameskip5.Name = "miFrameskip5";
-			this.miFrameskip5.Size = new System.Drawing.Size(181, 22);
-			this.miFrameskip5.Text = "5";
-			this.miFrameskip5.Click += new System.EventHandler(this.miFrameskip5_Click);
-			// 
-			// miFrameskip6
-			// 
-			this.miFrameskip6.Name = "miFrameskip6";
-			this.miFrameskip6.Size = new System.Drawing.Size(181, 22);
-			this.miFrameskip6.Text = "6";
-			this.miFrameskip6.Click += new System.EventHandler(this.miFrameskip6_Click);
-			// 
-			// miFrameskip7
-			// 
-			this.miFrameskip7.Name = "miFrameskip7";
-			this.miFrameskip7.Size = new System.Drawing.Size(181, 22);
-			this.miFrameskip7.Text = "7";
-			this.miFrameskip7.Click += new System.EventHandler(this.miFrameskip7_Click);
-			// 
-			// miFrameskip8
-			// 
-			this.miFrameskip8.Name = "miFrameskip8";
-			this.miFrameskip8.Size = new System.Drawing.Size(181, 22);
-			this.miFrameskip8.Text = "8";
-			this.miFrameskip8.Click += new System.EventHandler(this.miFrameskip8_Click);
-			// 
-			// miFrameskip9
-			// 
-			this.miFrameskip9.Name = "miFrameskip9";
-			this.miFrameskip9.Size = new System.Drawing.Size(181, 22);
-			this.miFrameskip9.Text = "9";
-			this.miFrameskip9.Click += new System.EventHandler(this.miFrameskip9_Click);
-			// 
-			// toolStripMenuItem5
-			// 
-			this.toolStripMenuItem5.Name = "toolStripMenuItem5";
-			this.toolStripMenuItem5.Size = new System.Drawing.Size(178, 6);
-			// 
-			// miSpeed50
-			// 
-			this.miSpeed50.Name = "miSpeed50";
-			this.miSpeed50.Size = new System.Drawing.Size(181, 22);
-			this.miSpeed50.Text = "Speed 50%";
-			this.miSpeed50.Click += new System.EventHandler(this.miSpeed50_Click);
-			// 
-			// miSpeed75
-			// 
-			this.miSpeed75.Name = "miSpeed75";
-			this.miSpeed75.Size = new System.Drawing.Size(181, 22);
-			this.miSpeed75.Text = "Speed 75%";
-			this.miSpeed75.Click += new System.EventHandler(this.miSpeed75_Click);
-			// 
-			// miSpeed100
-			// 
-			this.miSpeed100.Name = "miSpeed100";
-			this.miSpeed100.Size = new System.Drawing.Size(181, 22);
-			this.miSpeed100.Text = "Speed 100%";
-			this.miSpeed100.Click += new System.EventHandler(this.miSpeed100_Click);
-			// 
-			// miSpeed150
-			// 
-			this.miSpeed150.Name = "miSpeed150";
-			this.miSpeed150.Size = new System.Drawing.Size(181, 22);
-			this.miSpeed150.Text = "Speed 150%";
-			this.miSpeed150.Click += new System.EventHandler(this.miSpeed150_Click);
-			// 
-			// miSpeed200
-			// 
-			this.miSpeed200.Name = "miSpeed200";
-			this.miSpeed200.Size = new System.Drawing.Size(181, 22);
-			this.miSpeed200.Text = "Speed 200%";
-			this.miSpeed200.Click += new System.EventHandler(this.miSpeed200_Click);
-			// 
-			// toolStripSeparator10
-			// 
-			this.toolStripSeparator10.Name = "toolStripSeparator10";
-			this.toolStripSeparator10.Size = new System.Drawing.Size(135, 6);
-			// 
-			// saveConfigToolStripMenuItem
-			// 
-			this.saveConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Save;
-			this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem";
-			this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
-			this.saveConfigToolStripMenuItem.Text = "Save Config";
-			this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click);
-			// 
-			// loadConfigToolStripMenuItem
-			// 
-			this.loadConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig;
-			this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem";
-			this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
-			this.loadConfigToolStripMenuItem.Text = "Load Config";
-			// 
-			// toolsToolStripMenuItem
-			// 
-			this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem";
+            this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+            this.frameSkipToolStripMenuItem.Text = "Speed/Skip";
+            this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened);
+            // 
+            // miLimitFramerate
+            // 
+            this.miLimitFramerate.Name = "miLimitFramerate";
+            this.miLimitFramerate.Size = new System.Drawing.Size(202, 22);
+            this.miLimitFramerate.Text = "Limit Framerate";
+            this.miLimitFramerate.Click += new System.EventHandler(this.miLimitFramerate_Click);
+            // 
+            // miDisplayVsync
+            // 
+            this.miDisplayVsync.Name = "miDisplayVsync";
+            this.miDisplayVsync.Size = new System.Drawing.Size(202, 22);
+            this.miDisplayVsync.Text = "Display VSync";
+            this.miDisplayVsync.Click += new System.EventHandler(this.miDisplayVsync_Click);
+            // 
+            // toolStripMenuItem3
+            // 
+            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(199, 6);
+            // 
+            // miAutoMinimizeSkipping
+            // 
+            this.miAutoMinimizeSkipping.Name = "miAutoMinimizeSkipping";
+            this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(202, 22);
+            this.miAutoMinimizeSkipping.Text = "Auto-minimize skipping";
+            this.miAutoMinimizeSkipping.Click += new System.EventHandler(this.miAutoMinimizeSkipping_Click);
+            // 
+            // miFrameskip0
+            // 
+            this.miFrameskip0.Name = "miFrameskip0";
+            this.miFrameskip0.Size = new System.Drawing.Size(202, 22);
+            this.miFrameskip0.Text = "0 (never skip)";
+            this.miFrameskip0.Click += new System.EventHandler(this.miFrameskip0_Click);
+            // 
+            // miFrameskip1
+            // 
+            this.miFrameskip1.Name = "miFrameskip1";
+            this.miFrameskip1.Size = new System.Drawing.Size(202, 22);
+            this.miFrameskip1.Text = "1";
+            this.miFrameskip1.Click += new System.EventHandler(this.miFrameskip1_Click);
+            // 
+            // miFrameskip2
+            // 
+            this.miFrameskip2.Name = "miFrameskip2";
+            this.miFrameskip2.Size = new System.Drawing.Size(202, 22);
+            this.miFrameskip2.Text = "2";
+            this.miFrameskip2.Click += new System.EventHandler(this.miFrameskip2_Click);
+            // 
+            // miFrameskip3
+            // 
+            this.miFrameskip3.Name = "miFrameskip3";
+            this.miFrameskip3.Size = new System.Drawing.Size(202, 22);
+            this.miFrameskip3.Text = "3";
+            this.miFrameskip3.Click += new System.EventHandler(this.miFrameskip3_Click);
+            // 
+            // miFrameskip4
+            // 
+            this.miFrameskip4.Name = "miFrameskip4";
+            this.miFrameskip4.Size = new System.Drawing.Size(202, 22);
+            this.miFrameskip4.Text = "4";
+            this.miFrameskip4.Click += new System.EventHandler(this.miFrameskip4_Click);
+            // 
+            // miFrameskip5
+            // 
+            this.miFrameskip5.Name = "miFrameskip5";
+            this.miFrameskip5.Size = new System.Drawing.Size(202, 22);
+            this.miFrameskip5.Text = "5";
+            this.miFrameskip5.Click += new System.EventHandler(this.miFrameskip5_Click);
+            // 
+            // miFrameskip6
+            // 
+            this.miFrameskip6.Name = "miFrameskip6";
+            this.miFrameskip6.Size = new System.Drawing.Size(202, 22);
+            this.miFrameskip6.Text = "6";
+            this.miFrameskip6.Click += new System.EventHandler(this.miFrameskip6_Click);
+            // 
+            // miFrameskip7
+            // 
+            this.miFrameskip7.Name = "miFrameskip7";
+            this.miFrameskip7.Size = new System.Drawing.Size(202, 22);
+            this.miFrameskip7.Text = "7";
+            this.miFrameskip7.Click += new System.EventHandler(this.miFrameskip7_Click);
+            // 
+            // miFrameskip8
+            // 
+            this.miFrameskip8.Name = "miFrameskip8";
+            this.miFrameskip8.Size = new System.Drawing.Size(202, 22);
+            this.miFrameskip8.Text = "8";
+            this.miFrameskip8.Click += new System.EventHandler(this.miFrameskip8_Click);
+            // 
+            // miFrameskip9
+            // 
+            this.miFrameskip9.Name = "miFrameskip9";
+            this.miFrameskip9.Size = new System.Drawing.Size(202, 22);
+            this.miFrameskip9.Text = "9";
+            this.miFrameskip9.Click += new System.EventHandler(this.miFrameskip9_Click);
+            // 
+            // toolStripMenuItem5
+            // 
+            this.toolStripMenuItem5.Name = "toolStripMenuItem5";
+            this.toolStripMenuItem5.Size = new System.Drawing.Size(199, 6);
+            // 
+            // miSpeed50
+            // 
+            this.miSpeed50.Name = "miSpeed50";
+            this.miSpeed50.Size = new System.Drawing.Size(202, 22);
+            this.miSpeed50.Text = "Speed 50%";
+            this.miSpeed50.Click += new System.EventHandler(this.miSpeed50_Click);
+            // 
+            // miSpeed75
+            // 
+            this.miSpeed75.Name = "miSpeed75";
+            this.miSpeed75.Size = new System.Drawing.Size(202, 22);
+            this.miSpeed75.Text = "Speed 75%";
+            this.miSpeed75.Click += new System.EventHandler(this.miSpeed75_Click);
+            // 
+            // miSpeed100
+            // 
+            this.miSpeed100.Name = "miSpeed100";
+            this.miSpeed100.Size = new System.Drawing.Size(202, 22);
+            this.miSpeed100.Text = "Speed 100%";
+            this.miSpeed100.Click += new System.EventHandler(this.miSpeed100_Click);
+            // 
+            // miSpeed150
+            // 
+            this.miSpeed150.Name = "miSpeed150";
+            this.miSpeed150.Size = new System.Drawing.Size(202, 22);
+            this.miSpeed150.Text = "Speed 150%";
+            this.miSpeed150.Click += new System.EventHandler(this.miSpeed150_Click);
+            // 
+            // miSpeed200
+            // 
+            this.miSpeed200.Name = "miSpeed200";
+            this.miSpeed200.Size = new System.Drawing.Size(202, 22);
+            this.miSpeed200.Text = "Speed 200%";
+            this.miSpeed200.Click += new System.EventHandler(this.miSpeed200_Click);
+            // 
+            // toolStripSeparator10
+            // 
+            this.toolStripSeparator10.Name = "toolStripSeparator10";
+            this.toolStripSeparator10.Size = new System.Drawing.Size(138, 6);
+            // 
+            // saveConfigToolStripMenuItem
+            // 
+            this.saveConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Save;
+            this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem";
+            this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+            this.saveConfigToolStripMenuItem.Text = "Save Config";
+            this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click);
+            // 
+            // loadConfigToolStripMenuItem
+            // 
+            this.loadConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig;
+            this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem";
+            this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+            this.loadConfigToolStripMenuItem.Text = "Load Config";
+            // 
+            // toolsToolStripMenuItem
+            // 
+            this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolBoxToolStripMenuItem,
             this.toolStripSeparator12,
             this.rAMWatchToolStripMenuItem,
@@ -1554,327 +1554,327 @@
             this.toolStripSeparator11,
             this.luaConsoleToolStripMenuItem,
             this.cheatsToolStripMenuItem});
-			this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
-			this.toolsToolStripMenuItem.Size = new System.Drawing.Size(44, 17);
-			this.toolsToolStripMenuItem.Text = "&Tools";
-			this.toolsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.toolsToolStripMenuItem_DropDownOpened);
-			// 
-			// toolBoxToolStripMenuItem
-			// 
-			this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox;
-			this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem";
-			this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
-			this.toolBoxToolStripMenuItem.Text = "&Tool Box";
-			this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator12
-			// 
-			this.toolStripSeparator12.Name = "toolStripSeparator12";
-			this.toolStripSeparator12.Size = new System.Drawing.Size(129, 6);
-			// 
-			// rAMWatchToolStripMenuItem
-			// 
-			this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
-			this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem";
-			this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
-			this.rAMWatchToolStripMenuItem.Text = "RAM &Watch";
-			this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click);
-			// 
-			// rAMSearchToolStripMenuItem
-			// 
-			this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search;
-			this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem";
-			this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
-			this.rAMSearchToolStripMenuItem.Text = "RAM &Search";
-			this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click);
-			// 
-			// rAMPokeToolStripMenuItem
-			// 
-			this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
-			this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem";
-			this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
-			this.rAMPokeToolStripMenuItem.Text = "RAM &Poke";
-			this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click);
-			// 
-			// hexEditorToolStripMenuItem
-			// 
-			this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
-			this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem";
-			this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
-			this.hexEditorToolStripMenuItem.Text = "&Hex Editor";
-			this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click);
-			// 
-			// tAStudioToolStripMenuItem
-			// 
-			this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio;
-			this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem";
-			this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
-			this.tAStudioToolStripMenuItem.Text = "&TAStudio";
-			this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator11
-			// 
-			this.toolStripSeparator11.Name = "toolStripSeparator11";
-			this.toolStripSeparator11.Size = new System.Drawing.Size(129, 6);
-			// 
-			// luaConsoleToolStripMenuItem
-			// 
-			this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua;
-			this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem";
-			this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
-			this.luaConsoleToolStripMenuItem.Text = "Lua Console";
-			this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click);
-			// 
-			// cheatsToolStripMenuItem
-			// 
-			this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
-			this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem";
-			this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
-			this.cheatsToolStripMenuItem.Text = "Cheats";
-			this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click);
-			// 
-			// NESToolStripMenuItem
-			// 
-			this.NESToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
+            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19);
+            this.toolsToolStripMenuItem.Text = "&Tools";
+            this.toolsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.toolsToolStripMenuItem_DropDownOpened);
+            // 
+            // toolBoxToolStripMenuItem
+            // 
+            this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox;
+            this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem";
+            this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.toolBoxToolStripMenuItem.Text = "&Tool Box";
+            this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator12
+            // 
+            this.toolStripSeparator12.Name = "toolStripSeparator12";
+            this.toolStripSeparator12.Size = new System.Drawing.Size(136, 6);
+            // 
+            // rAMWatchToolStripMenuItem
+            // 
+            this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
+            this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem";
+            this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.rAMWatchToolStripMenuItem.Text = "RAM &Watch";
+            this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click);
+            // 
+            // rAMSearchToolStripMenuItem
+            // 
+            this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search;
+            this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem";
+            this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.rAMSearchToolStripMenuItem.Text = "RAM &Search";
+            this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click);
+            // 
+            // rAMPokeToolStripMenuItem
+            // 
+            this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
+            this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem";
+            this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.rAMPokeToolStripMenuItem.Text = "RAM &Poke";
+            this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click);
+            // 
+            // hexEditorToolStripMenuItem
+            // 
+            this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
+            this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem";
+            this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.hexEditorToolStripMenuItem.Text = "&Hex Editor";
+            this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click);
+            // 
+            // tAStudioToolStripMenuItem
+            // 
+            this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio;
+            this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem";
+            this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.tAStudioToolStripMenuItem.Text = "&TAStudio";
+            this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator11
+            // 
+            this.toolStripSeparator11.Name = "toolStripSeparator11";
+            this.toolStripSeparator11.Size = new System.Drawing.Size(136, 6);
+            // 
+            // luaConsoleToolStripMenuItem
+            // 
+            this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua;
+            this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem";
+            this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.luaConsoleToolStripMenuItem.Text = "Lua Console";
+            this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click);
+            // 
+            // cheatsToolStripMenuItem
+            // 
+            this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
+            this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem";
+            this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.cheatsToolStripMenuItem.Text = "Cheats";
+            this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click);
+            // 
+            // NESToolStripMenuItem
+            // 
+            this.NESToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.debuggerToolStripMenuItem,
             this.pPUViewerToolStripMenuItem,
             this.nametableViewerToolStripMenuItem,
             this.gameGenieCodesToolStripMenuItem,
             this.toolStripSeparator17,
             this.graphicsSettingsToolStripMenuItem});
-			this.NESToolStripMenuItem.Name = "NESToolStripMenuItem";
-			this.NESToolStripMenuItem.Size = new System.Drawing.Size(38, 17);
-			this.NESToolStripMenuItem.Text = "&NES";
-			// 
-			// debuggerToolStripMenuItem
-			// 
-			this.debuggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug;
-			this.debuggerToolStripMenuItem.Name = "debuggerToolStripMenuItem";
-			this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
-			this.debuggerToolStripMenuItem.Text = "&Debugger";
-			this.debuggerToolStripMenuItem.Click += new System.EventHandler(this.debuggerToolStripMenuItem_Click);
-			// 
-			// pPUViewerToolStripMenuItem
-			// 
-			this.pPUViewerToolStripMenuItem.Name = "pPUViewerToolStripMenuItem";
-			this.pPUViewerToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
-			this.pPUViewerToolStripMenuItem.Text = "&PPU Viewer";
-			this.pPUViewerToolStripMenuItem.Click += new System.EventHandler(this.PPUViewerToolStripMenuItem_Click);
-			// 
-			// nametableViewerToolStripMenuItem
-			// 
-			this.nametableViewerToolStripMenuItem.Name = "nametableViewerToolStripMenuItem";
-			this.nametableViewerToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
-			this.nametableViewerToolStripMenuItem.Text = "&Nametable Viewer";
-			this.nametableViewerToolStripMenuItem.Click += new System.EventHandler(this.nametableViewerToolStripMenuItem_Click);
-			// 
-			// gameGenieCodesToolStripMenuItem
-			// 
-			this.gameGenieCodesToolStripMenuItem.Name = "gameGenieCodesToolStripMenuItem";
-			this.gameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
-			this.gameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder";
-			this.gameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.gameGenieCodesToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator17
-			// 
-			this.toolStripSeparator17.Name = "toolStripSeparator17";
-			this.toolStripSeparator17.Size = new System.Drawing.Size(214, 6);
-			// 
-			// graphicsSettingsToolStripMenuItem
-			// 
-			this.graphicsSettingsToolStripMenuItem.Name = "graphicsSettingsToolStripMenuItem";
-			this.graphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
-			this.graphicsSettingsToolStripMenuItem.Text = "Graphics Settings";
-			this.graphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.graphicsSettingsToolStripMenuItem_Click);
-			// 
-			// pCEToolStripMenuItem
-			// 
-			this.pCEToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.NESToolStripMenuItem.Name = "NESToolStripMenuItem";
+            this.NESToolStripMenuItem.Size = new System.Drawing.Size(40, 19);
+            this.NESToolStripMenuItem.Text = "&NES";
+            // 
+            // debuggerToolStripMenuItem
+            // 
+            this.debuggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug;
+            this.debuggerToolStripMenuItem.Name = "debuggerToolStripMenuItem";
+            this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
+            this.debuggerToolStripMenuItem.Text = "&Debugger";
+            this.debuggerToolStripMenuItem.Click += new System.EventHandler(this.debuggerToolStripMenuItem_Click);
+            // 
+            // pPUViewerToolStripMenuItem
+            // 
+            this.pPUViewerToolStripMenuItem.Name = "pPUViewerToolStripMenuItem";
+            this.pPUViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
+            this.pPUViewerToolStripMenuItem.Text = "&PPU Viewer";
+            this.pPUViewerToolStripMenuItem.Click += new System.EventHandler(this.PPUViewerToolStripMenuItem_Click);
+            // 
+            // nametableViewerToolStripMenuItem
+            // 
+            this.nametableViewerToolStripMenuItem.Name = "nametableViewerToolStripMenuItem";
+            this.nametableViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
+            this.nametableViewerToolStripMenuItem.Text = "&Nametable Viewer";
+            this.nametableViewerToolStripMenuItem.Click += new System.EventHandler(this.nametableViewerToolStripMenuItem_Click);
+            // 
+            // gameGenieCodesToolStripMenuItem
+            // 
+            this.gameGenieCodesToolStripMenuItem.Name = "gameGenieCodesToolStripMenuItem";
+            this.gameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
+            this.gameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder";
+            this.gameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.gameGenieCodesToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator17
+            // 
+            this.toolStripSeparator17.Name = "toolStripSeparator17";
+            this.toolStripSeparator17.Size = new System.Drawing.Size(230, 6);
+            // 
+            // graphicsSettingsToolStripMenuItem
+            // 
+            this.graphicsSettingsToolStripMenuItem.Name = "graphicsSettingsToolStripMenuItem";
+            this.graphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
+            this.graphicsSettingsToolStripMenuItem.Text = "Graphics Settings";
+            this.graphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.graphicsSettingsToolStripMenuItem_Click);
+            // 
+            // pCEToolStripMenuItem
+            // 
+            this.pCEToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.pceBGViewerToolStripMenuItem,
             this.toolStripSeparator25,
             this.pceAlwaysPerformSpriteLimitToolStripMenuItem,
             this.pceAlwaysEqualizeVolumesToolStripMenuItem,
             this.pceArcadeCardRewindEnableHackToolStripMenuItem,
             this.pceGraphicsSettingsToolStripMenuItem});
-			this.pCEToolStripMenuItem.Name = "pCEToolStripMenuItem";
-			this.pCEToolStripMenuItem.Size = new System.Drawing.Size(38, 17);
-			this.pCEToolStripMenuItem.Text = "&PCE";
-			this.pCEToolStripMenuItem.DropDownOpened += new System.EventHandler(this.pCEToolStripMenuItem_DropDownOpened);
-			// 
-			// pceBGViewerToolStripMenuItem
-			// 
-			this.pceBGViewerToolStripMenuItem.Name = "pceBGViewerToolStripMenuItem";
-			this.pceBGViewerToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
-			this.pceBGViewerToolStripMenuItem.Text = "&BG Viewer";
-			this.pceBGViewerToolStripMenuItem.Click += new System.EventHandler(this.justatestToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator25
-			// 
-			this.toolStripSeparator25.Name = "toolStripSeparator25";
-			this.toolStripSeparator25.Size = new System.Drawing.Size(237, 6);
-			// 
-			// pceAlwaysPerformSpriteLimitToolStripMenuItem
-			// 
-			this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Name = "pceAlwaysPerformSpriteLimitToolStripMenuItem";
-			this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
-			this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Text = "Always Perform Sprite Limit";
-			this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.pceAlwaysPerformSpriteLimitToolStripMenuItem_Click);
-			// 
-			// pceAlwaysEqualizeVolumesToolStripMenuItem
-			// 
-			this.pceAlwaysEqualizeVolumesToolStripMenuItem.Name = "pceAlwaysEqualizeVolumesToolStripMenuItem";
-			this.pceAlwaysEqualizeVolumesToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
-			this.pceAlwaysEqualizeVolumesToolStripMenuItem.Text = "Always Equalize Volumes (PCE-CD)";
-			this.pceAlwaysEqualizeVolumesToolStripMenuItem.Click += new System.EventHandler(this.pceAlwayEqualizeVolumesLimitToolStripMenuItem_Click);
-			// 
-			// pceArcadeCardRewindEnableHackToolStripMenuItem
-			// 
-			this.pceArcadeCardRewindEnableHackToolStripMenuItem.Name = "pceArcadeCardRewindEnableHackToolStripMenuItem";
-			this.pceArcadeCardRewindEnableHackToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
-			this.pceArcadeCardRewindEnableHackToolStripMenuItem.Text = "Arcade Card Rewind-Enable Hack";
-			this.pceArcadeCardRewindEnableHackToolStripMenuItem.Click += new System.EventHandler(this.pceArcadeCardRewindEnableHackToolStripMenuItem_Click);
-			// 
-			// pceGraphicsSettingsToolStripMenuItem
-			// 
-			this.pceGraphicsSettingsToolStripMenuItem.Name = "pceGraphicsSettingsToolStripMenuItem";
-			this.pceGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
-			this.pceGraphicsSettingsToolStripMenuItem.Text = "Graphics Settings";
-			this.pceGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.pceGraphicsSettingsToolStripMenuItem_Click);
-			// 
-			// sMSToolStripMenuItem
-			// 
-			this.sMSToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.pCEToolStripMenuItem.Name = "pCEToolStripMenuItem";
+            this.pCEToolStripMenuItem.Size = new System.Drawing.Size(40, 19);
+            this.pCEToolStripMenuItem.Text = "&PCE";
+            this.pCEToolStripMenuItem.DropDownOpened += new System.EventHandler(this.pCEToolStripMenuItem_DropDownOpened);
+            // 
+            // pceBGViewerToolStripMenuItem
+            // 
+            this.pceBGViewerToolStripMenuItem.Name = "pceBGViewerToolStripMenuItem";
+            this.pceBGViewerToolStripMenuItem.Size = new System.Drawing.Size(259, 22);
+            this.pceBGViewerToolStripMenuItem.Text = "&BG Viewer";
+            this.pceBGViewerToolStripMenuItem.Click += new System.EventHandler(this.justatestToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator25
+            // 
+            this.toolStripSeparator25.Name = "toolStripSeparator25";
+            this.toolStripSeparator25.Size = new System.Drawing.Size(256, 6);
+            // 
+            // pceAlwaysPerformSpriteLimitToolStripMenuItem
+            // 
+            this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Name = "pceAlwaysPerformSpriteLimitToolStripMenuItem";
+            this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(259, 22);
+            this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Text = "Always Perform Sprite Limit";
+            this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.pceAlwaysPerformSpriteLimitToolStripMenuItem_Click);
+            // 
+            // pceAlwaysEqualizeVolumesToolStripMenuItem
+            // 
+            this.pceAlwaysEqualizeVolumesToolStripMenuItem.Name = "pceAlwaysEqualizeVolumesToolStripMenuItem";
+            this.pceAlwaysEqualizeVolumesToolStripMenuItem.Size = new System.Drawing.Size(259, 22);
+            this.pceAlwaysEqualizeVolumesToolStripMenuItem.Text = "Always Equalize Volumes (PCE-CD)";
+            this.pceAlwaysEqualizeVolumesToolStripMenuItem.Click += new System.EventHandler(this.pceAlwayEqualizeVolumesLimitToolStripMenuItem_Click);
+            // 
+            // pceArcadeCardRewindEnableHackToolStripMenuItem
+            // 
+            this.pceArcadeCardRewindEnableHackToolStripMenuItem.Name = "pceArcadeCardRewindEnableHackToolStripMenuItem";
+            this.pceArcadeCardRewindEnableHackToolStripMenuItem.Size = new System.Drawing.Size(259, 22);
+            this.pceArcadeCardRewindEnableHackToolStripMenuItem.Text = "Arcade Card Rewind-Enable Hack";
+            this.pceArcadeCardRewindEnableHackToolStripMenuItem.Click += new System.EventHandler(this.pceArcadeCardRewindEnableHackToolStripMenuItem_Click);
+            // 
+            // pceGraphicsSettingsToolStripMenuItem
+            // 
+            this.pceGraphicsSettingsToolStripMenuItem.Name = "pceGraphicsSettingsToolStripMenuItem";
+            this.pceGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(259, 22);
+            this.pceGraphicsSettingsToolStripMenuItem.Text = "Graphics Settings";
+            this.pceGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.pceGraphicsSettingsToolStripMenuItem_Click);
+            // 
+            // sMSToolStripMenuItem
+            // 
+            this.sMSToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.smsEnableFMChipToolStripMenuItem,
             this.smsOverclockWhenKnownSafeToolStripMenuItem,
             this.smsForceStereoSeparationToolStripMenuItem,
             this.smsSpriteLimitToolStripMenuItem,
             this.smsGraphicsSettingsToolStripMenuItem});
-			this.sMSToolStripMenuItem.Name = "sMSToolStripMenuItem";
-			this.sMSToolStripMenuItem.Size = new System.Drawing.Size(39, 17);
-			this.sMSToolStripMenuItem.Text = "&SMS";
-			this.sMSToolStripMenuItem.DropDownOpened += new System.EventHandler(this.sMSToolStripMenuItem_DropDownOpened);
-			// 
-			// smsEnableFMChipToolStripMenuItem
-			// 
-			this.smsEnableFMChipToolStripMenuItem.Name = "smsEnableFMChipToolStripMenuItem";
-			this.smsEnableFMChipToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
-			this.smsEnableFMChipToolStripMenuItem.Text = "Enable FM Chip";
-			this.smsEnableFMChipToolStripMenuItem.Click += new System.EventHandler(this.smsEnableFMChipToolStripMenuItem_Click);
-			// 
-			// smsOverclockWhenKnownSafeToolStripMenuItem
-			// 
-			this.smsOverclockWhenKnownSafeToolStripMenuItem.Name = "smsOverclockWhenKnownSafeToolStripMenuItem";
-			this.smsOverclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
-			this.smsOverclockWhenKnownSafeToolStripMenuItem.Text = "Overclock when Known Safe";
-			this.smsOverclockWhenKnownSafeToolStripMenuItem.Click += new System.EventHandler(this.smsOverclockWhenKnownSafeToolStripMenuItem_Click);
-			// 
-			// smsForceStereoSeparationToolStripMenuItem
-			// 
-			this.smsForceStereoSeparationToolStripMenuItem.Name = "smsForceStereoSeparationToolStripMenuItem";
-			this.smsForceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
-			this.smsForceStereoSeparationToolStripMenuItem.Text = "Force Stereo Separation";
-			this.smsForceStereoSeparationToolStripMenuItem.Click += new System.EventHandler(this.smsForceStereoSeparationToolStripMenuItem_Click);
-			// 
-			// smsSpriteLimitToolStripMenuItem
-			// 
-			this.smsSpriteLimitToolStripMenuItem.Name = "smsSpriteLimitToolStripMenuItem";
-			this.smsSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
-			this.smsSpriteLimitToolStripMenuItem.Text = "Sprite Limit";
-			this.smsSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.smsSpriteLimitToolStripMenuItem_Click);
-			// 
-			// smsGraphicsSettingsToolStripMenuItem
-			// 
-			this.smsGraphicsSettingsToolStripMenuItem.Name = "smsGraphicsSettingsToolStripMenuItem";
-			this.smsGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
-			this.smsGraphicsSettingsToolStripMenuItem.Text = "Graphics Settings";
-			this.smsGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.smsGraphicsSettingsToolStripMenuItem_Click);
-			// 
-			// tI83ToolStripMenuItem
-			// 
-			this.tI83ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.sMSToolStripMenuItem.Name = "sMSToolStripMenuItem";
+            this.sMSToolStripMenuItem.Size = new System.Drawing.Size(42, 19);
+            this.sMSToolStripMenuItem.Text = "&SMS";
+            this.sMSToolStripMenuItem.DropDownOpened += new System.EventHandler(this.sMSToolStripMenuItem_DropDownOpened);
+            // 
+            // smsEnableFMChipToolStripMenuItem
+            // 
+            this.smsEnableFMChipToolStripMenuItem.Name = "smsEnableFMChipToolStripMenuItem";
+            this.smsEnableFMChipToolStripMenuItem.Size = new System.Drawing.Size(224, 22);
+            this.smsEnableFMChipToolStripMenuItem.Text = "Enable FM Chip";
+            this.smsEnableFMChipToolStripMenuItem.Click += new System.EventHandler(this.smsEnableFMChipToolStripMenuItem_Click);
+            // 
+            // smsOverclockWhenKnownSafeToolStripMenuItem
+            // 
+            this.smsOverclockWhenKnownSafeToolStripMenuItem.Name = "smsOverclockWhenKnownSafeToolStripMenuItem";
+            this.smsOverclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(224, 22);
+            this.smsOverclockWhenKnownSafeToolStripMenuItem.Text = "Overclock when Known Safe";
+            this.smsOverclockWhenKnownSafeToolStripMenuItem.Click += new System.EventHandler(this.smsOverclockWhenKnownSafeToolStripMenuItem_Click);
+            // 
+            // smsForceStereoSeparationToolStripMenuItem
+            // 
+            this.smsForceStereoSeparationToolStripMenuItem.Name = "smsForceStereoSeparationToolStripMenuItem";
+            this.smsForceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(224, 22);
+            this.smsForceStereoSeparationToolStripMenuItem.Text = "Force Stereo Separation";
+            this.smsForceStereoSeparationToolStripMenuItem.Click += new System.EventHandler(this.smsForceStereoSeparationToolStripMenuItem_Click);
+            // 
+            // smsSpriteLimitToolStripMenuItem
+            // 
+            this.smsSpriteLimitToolStripMenuItem.Name = "smsSpriteLimitToolStripMenuItem";
+            this.smsSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(224, 22);
+            this.smsSpriteLimitToolStripMenuItem.Text = "Sprite Limit";
+            this.smsSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.smsSpriteLimitToolStripMenuItem_Click);
+            // 
+            // smsGraphicsSettingsToolStripMenuItem
+            // 
+            this.smsGraphicsSettingsToolStripMenuItem.Name = "smsGraphicsSettingsToolStripMenuItem";
+            this.smsGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(224, 22);
+            this.smsGraphicsSettingsToolStripMenuItem.Text = "Graphics Settings";
+            this.smsGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.smsGraphicsSettingsToolStripMenuItem_Click);
+            // 
+            // tI83ToolStripMenuItem
+            // 
+            this.tI83ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.keypadToolStripMenuItem,
             this.toolStripSeparator13,
             this.autoloadVirtualKeyboardToolStripMenuItem});
-			this.tI83ToolStripMenuItem.Name = "tI83ToolStripMenuItem";
-			this.tI83ToolStripMenuItem.Size = new System.Drawing.Size(41, 17);
-			this.tI83ToolStripMenuItem.Text = "TI83";
-			this.tI83ToolStripMenuItem.DropDownOpened += new System.EventHandler(this.tI83ToolStripMenuItem_DropDownOpened);
-			// 
-			// keypadToolStripMenuItem
-			// 
-			this.keypadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.calculator;
-			this.keypadToolStripMenuItem.Name = "keypadToolStripMenuItem";
-			this.keypadToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
-			this.keypadToolStripMenuItem.Text = "Keypad";
-			this.keypadToolStripMenuItem.Click += new System.EventHandler(this.keypadToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator13
-			// 
-			this.toolStripSeparator13.Name = "toolStripSeparator13";
-			this.toolStripSeparator13.Size = new System.Drawing.Size(153, 6);
-			// 
-			// autoloadVirtualKeyboardToolStripMenuItem
-			// 
-			this.autoloadVirtualKeyboardToolStripMenuItem.Checked = true;
-			this.autoloadVirtualKeyboardToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.autoloadVirtualKeyboardToolStripMenuItem.Name = "autoloadVirtualKeyboardToolStripMenuItem";
-			this.autoloadVirtualKeyboardToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
-			this.autoloadVirtualKeyboardToolStripMenuItem.Text = "Autoload Keypad";
-			this.autoloadVirtualKeyboardToolStripMenuItem.Click += new System.EventHandler(this.autoloadVirtualKeyboardToolStripMenuItem_Click);
-			// 
-			// gBToolStripMenuItem
-			// 
-			this.gBToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tI83ToolStripMenuItem.Name = "tI83ToolStripMenuItem";
+            this.tI83ToolStripMenuItem.Size = new System.Drawing.Size(41, 19);
+            this.tI83ToolStripMenuItem.Text = "TI83";
+            this.tI83ToolStripMenuItem.DropDownOpened += new System.EventHandler(this.tI83ToolStripMenuItem_DropDownOpened);
+            // 
+            // keypadToolStripMenuItem
+            // 
+            this.keypadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.calculator;
+            this.keypadToolStripMenuItem.Name = "keypadToolStripMenuItem";
+            this.keypadToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
+            this.keypadToolStripMenuItem.Text = "Keypad";
+            this.keypadToolStripMenuItem.Click += new System.EventHandler(this.keypadToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator13
+            // 
+            this.toolStripSeparator13.Name = "toolStripSeparator13";
+            this.toolStripSeparator13.Size = new System.Drawing.Size(162, 6);
+            // 
+            // autoloadVirtualKeyboardToolStripMenuItem
+            // 
+            this.autoloadVirtualKeyboardToolStripMenuItem.Checked = true;
+            this.autoloadVirtualKeyboardToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.autoloadVirtualKeyboardToolStripMenuItem.Name = "autoloadVirtualKeyboardToolStripMenuItem";
+            this.autoloadVirtualKeyboardToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
+            this.autoloadVirtualKeyboardToolStripMenuItem.Text = "Autoload Keypad";
+            this.autoloadVirtualKeyboardToolStripMenuItem.Click += new System.EventHandler(this.autoloadVirtualKeyboardToolStripMenuItem_Click);
+            // 
+            // gBToolStripMenuItem
+            // 
+            this.gBToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.debuggerToolStripMenuItem1});
-			this.gBToolStripMenuItem.Name = "gBToolStripMenuItem";
-			this.gBToolStripMenuItem.Size = new System.Drawing.Size(32, 17);
-			this.gBToolStripMenuItem.Text = "GB";
-			// 
-			// debuggerToolStripMenuItem1
-			// 
-			this.debuggerToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Bug;
-			this.debuggerToolStripMenuItem1.Name = "debuggerToolStripMenuItem1";
-			this.debuggerToolStripMenuItem1.Size = new System.Drawing.Size(121, 22);
-			this.debuggerToolStripMenuItem1.Text = "Debugger";
-			this.debuggerToolStripMenuItem1.Click += new System.EventHandler(this.debuggerToolStripMenuItem1_Click);
-			// 
-			// helpToolStripMenuItem
-			// 
-			this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.gBToolStripMenuItem.Name = "gBToolStripMenuItem";
+            this.gBToolStripMenuItem.Size = new System.Drawing.Size(34, 19);
+            this.gBToolStripMenuItem.Text = "GB";
+            // 
+            // debuggerToolStripMenuItem1
+            // 
+            this.debuggerToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Bug;
+            this.debuggerToolStripMenuItem1.Name = "debuggerToolStripMenuItem1";
+            this.debuggerToolStripMenuItem1.Size = new System.Drawing.Size(126, 22);
+            this.debuggerToolStripMenuItem1.Text = "Debugger";
+            this.debuggerToolStripMenuItem1.Click += new System.EventHandler(this.debuggerToolStripMenuItem1_Click);
+            // 
+            // helpToolStripMenuItem
+            // 
+            this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.helpToolStripMenuItem1,
             this.forumsToolStripMenuItem,
             this.aboutToolStripMenuItem});
-			this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
-			this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 17);
-			this.helpToolStripMenuItem.Text = "&Help";
-			// 
-			// helpToolStripMenuItem1
-			// 
-			this.helpToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Help;
-			this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1";
-			this.helpToolStripMenuItem1.Size = new System.Drawing.Size(140, 22);
-			this.helpToolStripMenuItem1.Text = "&Online Help...";
-			this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click);
-			// 
-			// forumsToolStripMenuItem
-			// 
-			this.forumsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio;
-			this.forumsToolStripMenuItem.Name = "forumsToolStripMenuItem";
-			this.forumsToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
-			this.forumsToolStripMenuItem.Text = "Forums...";
-			this.forumsToolStripMenuItem.Click += new System.EventHandler(this.forumsToolStripMenuItem_Click);
-			// 
-			// aboutToolStripMenuItem
-			// 
-			this.aboutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CorpHawkSmall;
-			this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-			this.aboutToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
-			this.aboutToolStripMenuItem.Text = "&About";
-			this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
-			// 
-			// StatusSlot0
-			// 
-			this.StatusSlot0.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
+            this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 19);
+            this.helpToolStripMenuItem.Text = "&Help";
+            // 
+            // helpToolStripMenuItem1
+            // 
+            this.helpToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Help;
+            this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1";
+            this.helpToolStripMenuItem1.Size = new System.Drawing.Size(146, 22);
+            this.helpToolStripMenuItem1.Text = "&Online Help...";
+            this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click);
+            // 
+            // forumsToolStripMenuItem
+            // 
+            this.forumsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio;
+            this.forumsToolStripMenuItem.Name = "forumsToolStripMenuItem";
+            this.forumsToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            this.forumsToolStripMenuItem.Text = "Forums...";
+            this.forumsToolStripMenuItem.Click += new System.EventHandler(this.forumsToolStripMenuItem_Click);
+            // 
+            // aboutToolStripMenuItem
+            // 
+            this.aboutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CorpHawkSmall;
+            this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
+            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            this.aboutToolStripMenuItem.Text = "&About";
+            this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
+            // 
+            // StatusSlot0
+            // 
+            this.StatusSlot0.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.DumpStatus,
             this.EmuStatus,
             this.PlayRecordStatus,
@@ -1893,154 +1893,154 @@
             this.StatusSlot9,
             this.StatusSlot10,
             this.CheatStatus});
-			this.StatusSlot0.Location = new System.Drawing.Point(0, 386);
-			this.StatusSlot0.Name = "StatusSlot0";
-			this.StatusSlot0.ShowItemToolTips = true;
-			this.StatusSlot0.Size = new System.Drawing.Size(470, 22);
-			this.StatusSlot0.SizingGrip = false;
-			this.StatusSlot0.TabIndex = 1;
-			this.StatusSlot0.Text = "0";
-			// 
-			// DumpStatus
-			// 
-			this.DumpStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.DumpStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
-			this.DumpStatus.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.DumpStatus.Name = "DumpStatus";
-			this.DumpStatus.ShowDropDownArrow = false;
-			this.DumpStatus.Size = new System.Drawing.Size(20, 20);
-			this.DumpStatus.Text = "No ROM loaded";
-			this.DumpStatus.Click += new System.EventHandler(this.DumpStatus_Click);
-			// 
-			// EmuStatus
-			// 
-			this.EmuStatus.Name = "EmuStatus";
-			this.EmuStatus.Size = new System.Drawing.Size(0, 17);
-			// 
-			// PlayRecordStatus
-			// 
-			this.PlayRecordStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.PlayRecordStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
-			this.PlayRecordStatus.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.PlayRecordStatus.Name = "PlayRecordStatus";
-			this.PlayRecordStatus.ShowDropDownArrow = false;
-			this.PlayRecordStatus.Size = new System.Drawing.Size(20, 20);
-			this.PlayRecordStatus.Text = "Movie is in play mode";
-			// 
-			// PauseStrip
-			// 
-			this.PauseStrip.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-			this.PauseStrip.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.PauseStrip.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
-			this.PauseStrip.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.PauseStrip.Name = "PauseStrip";
-			this.PauseStrip.ShowDropDownArrow = false;
-			this.PauseStrip.Size = new System.Drawing.Size(20, 20);
-			this.PauseStrip.Text = "toolStripDropDownButton1";
-			this.PauseStrip.ToolTipText = "Emulator is paused";
-			this.PauseStrip.Click += new System.EventHandler(this.PauseStrip_Click);
-			// 
-			// FreezeStatus
-			// 
-			this.FreezeStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.FreezeStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
-			this.FreezeStatus.Name = "FreezeStatus";
-			this.FreezeStatus.Size = new System.Drawing.Size(28, 22);
-			this.FreezeStatus.Click += new System.EventHandler(this.FreezeStatus_Click);
-			// 
-			// AVIStatusLabel
-			// 
-			this.AVIStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.AVIStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
-			this.AVIStatusLabel.Name = "AVIStatusLabel";
-			this.AVIStatusLabel.Size = new System.Drawing.Size(16, 17);
-			this.AVIStatusLabel.Text = "AVI Capture";
-			// 
-			// toolStripStatusLabel1
-			// 
-			this.toolStripStatusLabel1.BackColor = System.Drawing.SystemColors.Control;
-			this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
-			this.toolStripStatusLabel1.Size = new System.Drawing.Size(56, 17);
-			this.toolStripStatusLabel1.Text = "Save slots";
-			// 
-			// StatusSlot1
-			// 
-			this.StatusSlot1.Name = "StatusSlot1";
-			this.StatusSlot1.Size = new System.Drawing.Size(13, 17);
-			this.StatusSlot1.Text = "1";
-			this.StatusSlot1.Click += new System.EventHandler(this.StatusSlot1_Click);
-			// 
-			// StatusSlot2
-			// 
-			this.StatusSlot2.Name = "StatusSlot2";
-			this.StatusSlot2.Size = new System.Drawing.Size(13, 17);
-			this.StatusSlot2.Text = "2";
-			this.StatusSlot2.Click += new System.EventHandler(this.StatusSlot2_Click);
-			// 
-			// StatusSlot3
-			// 
-			this.StatusSlot3.Name = "StatusSlot3";
-			this.StatusSlot3.Size = new System.Drawing.Size(13, 17);
-			this.StatusSlot3.Text = "3";
-			this.StatusSlot3.Click += new System.EventHandler(this.StatusSlot3_Click);
-			// 
-			// StatusSlot4
-			// 
-			this.StatusSlot4.Name = "StatusSlot4";
-			this.StatusSlot4.Size = new System.Drawing.Size(13, 17);
-			this.StatusSlot4.Text = "4";
-			this.StatusSlot4.Click += new System.EventHandler(this.StatusSlot4_Click);
-			// 
-			// StatusSlot5
-			// 
-			this.StatusSlot5.Name = "StatusSlot5";
-			this.StatusSlot5.Size = new System.Drawing.Size(13, 17);
-			this.StatusSlot5.Text = "5";
-			this.StatusSlot5.Click += new System.EventHandler(this.StatusSlot5_Click);
-			// 
-			// StatusSlot6
-			// 
-			this.StatusSlot6.Name = "StatusSlot6";
-			this.StatusSlot6.Size = new System.Drawing.Size(13, 17);
-			this.StatusSlot6.Text = "6";
-			this.StatusSlot6.Click += new System.EventHandler(this.StatusSlot6_Click);
-			// 
-			// StatusSlot7
-			// 
-			this.StatusSlot7.Name = "StatusSlot7";
-			this.StatusSlot7.Size = new System.Drawing.Size(13, 17);
-			this.StatusSlot7.Text = "7";
-			this.StatusSlot7.Click += new System.EventHandler(this.StatusSlot7_Click);
-			// 
-			// StatusSlot8
-			// 
-			this.StatusSlot8.Name = "StatusSlot8";
-			this.StatusSlot8.Size = new System.Drawing.Size(13, 17);
-			this.StatusSlot8.Text = "8";
-			this.StatusSlot8.Click += new System.EventHandler(this.StatusSlot8_Click);
-			// 
-			// StatusSlot9
-			// 
-			this.StatusSlot9.Name = "StatusSlot9";
-			this.StatusSlot9.Size = new System.Drawing.Size(13, 17);
-			this.StatusSlot9.Text = "9";
-			this.StatusSlot9.Click += new System.EventHandler(this.StatusSlot9_Click);
-			// 
-			// StatusSlot10
-			// 
-			this.StatusSlot10.Name = "StatusSlot10";
-			this.StatusSlot10.Size = new System.Drawing.Size(13, 17);
-			this.StatusSlot10.Text = "0";
-			this.StatusSlot10.Click += new System.EventHandler(this.StatusSlot10_Click);
-			// 
-			// CheatStatus
-			// 
-			this.CheatStatus.Name = "CheatStatus";
-			this.CheatStatus.Size = new System.Drawing.Size(0, 17);
-			// 
-			// contextMenuStrip1
-			// 
-			this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.StatusSlot0.Location = new System.Drawing.Point(0, 386);
+            this.StatusSlot0.Name = "StatusSlot0";
+            this.StatusSlot0.ShowItemToolTips = true;
+            this.StatusSlot0.Size = new System.Drawing.Size(470, 22);
+            this.StatusSlot0.SizingGrip = false;
+            this.StatusSlot0.TabIndex = 1;
+            this.StatusSlot0.Text = "0";
+            // 
+            // DumpStatus
+            // 
+            this.DumpStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.DumpStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
+            this.DumpStatus.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.DumpStatus.Name = "DumpStatus";
+            this.DumpStatus.ShowDropDownArrow = false;
+            this.DumpStatus.Size = new System.Drawing.Size(20, 20);
+            this.DumpStatus.Text = "No ROM loaded";
+            this.DumpStatus.Click += new System.EventHandler(this.DumpStatus_Click);
+            // 
+            // EmuStatus
+            // 
+            this.EmuStatus.Name = "EmuStatus";
+            this.EmuStatus.Size = new System.Drawing.Size(0, 17);
+            // 
+            // PlayRecordStatus
+            // 
+            this.PlayRecordStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.PlayRecordStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
+            this.PlayRecordStatus.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.PlayRecordStatus.Name = "PlayRecordStatus";
+            this.PlayRecordStatus.ShowDropDownArrow = false;
+            this.PlayRecordStatus.Size = new System.Drawing.Size(20, 20);
+            this.PlayRecordStatus.Text = "Movie is in play mode";
+            // 
+            // PauseStrip
+            // 
+            this.PauseStrip.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.PauseStrip.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.PauseStrip.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
+            this.PauseStrip.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.PauseStrip.Name = "PauseStrip";
+            this.PauseStrip.ShowDropDownArrow = false;
+            this.PauseStrip.Size = new System.Drawing.Size(20, 20);
+            this.PauseStrip.Text = "toolStripDropDownButton1";
+            this.PauseStrip.ToolTipText = "Emulator is paused";
+            this.PauseStrip.Click += new System.EventHandler(this.PauseStrip_Click);
+            // 
+            // FreezeStatus
+            // 
+            this.FreezeStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.FreezeStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
+            this.FreezeStatus.Name = "FreezeStatus";
+            this.FreezeStatus.Size = new System.Drawing.Size(28, 22);
+            this.FreezeStatus.Click += new System.EventHandler(this.FreezeStatus_Click);
+            // 
+            // AVIStatusLabel
+            // 
+            this.AVIStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.AVIStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Blank;
+            this.AVIStatusLabel.Name = "AVIStatusLabel";
+            this.AVIStatusLabel.Size = new System.Drawing.Size(16, 17);
+            this.AVIStatusLabel.Text = "AVI Capture";
+            // 
+            // toolStripStatusLabel1
+            // 
+            this.toolStripStatusLabel1.BackColor = System.Drawing.SystemColors.Control;
+            this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
+            this.toolStripStatusLabel1.Size = new System.Drawing.Size(58, 17);
+            this.toolStripStatusLabel1.Text = "Save slots";
+            // 
+            // StatusSlot1
+            // 
+            this.StatusSlot1.Name = "StatusSlot1";
+            this.StatusSlot1.Size = new System.Drawing.Size(13, 17);
+            this.StatusSlot1.Text = "1";
+            this.StatusSlot1.Click += new System.EventHandler(this.StatusSlot1_Click);
+            // 
+            // StatusSlot2
+            // 
+            this.StatusSlot2.Name = "StatusSlot2";
+            this.StatusSlot2.Size = new System.Drawing.Size(13, 17);
+            this.StatusSlot2.Text = "2";
+            this.StatusSlot2.Click += new System.EventHandler(this.StatusSlot2_Click);
+            // 
+            // StatusSlot3
+            // 
+            this.StatusSlot3.Name = "StatusSlot3";
+            this.StatusSlot3.Size = new System.Drawing.Size(13, 17);
+            this.StatusSlot3.Text = "3";
+            this.StatusSlot3.Click += new System.EventHandler(this.StatusSlot3_Click);
+            // 
+            // StatusSlot4
+            // 
+            this.StatusSlot4.Name = "StatusSlot4";
+            this.StatusSlot4.Size = new System.Drawing.Size(13, 17);
+            this.StatusSlot4.Text = "4";
+            this.StatusSlot4.Click += new System.EventHandler(this.StatusSlot4_Click);
+            // 
+            // StatusSlot5
+            // 
+            this.StatusSlot5.Name = "StatusSlot5";
+            this.StatusSlot5.Size = new System.Drawing.Size(13, 17);
+            this.StatusSlot5.Text = "5";
+            this.StatusSlot5.Click += new System.EventHandler(this.StatusSlot5_Click);
+            // 
+            // StatusSlot6
+            // 
+            this.StatusSlot6.Name = "StatusSlot6";
+            this.StatusSlot6.Size = new System.Drawing.Size(13, 17);
+            this.StatusSlot6.Text = "6";
+            this.StatusSlot6.Click += new System.EventHandler(this.StatusSlot6_Click);
+            // 
+            // StatusSlot7
+            // 
+            this.StatusSlot7.Name = "StatusSlot7";
+            this.StatusSlot7.Size = new System.Drawing.Size(13, 17);
+            this.StatusSlot7.Text = "7";
+            this.StatusSlot7.Click += new System.EventHandler(this.StatusSlot7_Click);
+            // 
+            // StatusSlot8
+            // 
+            this.StatusSlot8.Name = "StatusSlot8";
+            this.StatusSlot8.Size = new System.Drawing.Size(13, 17);
+            this.StatusSlot8.Text = "8";
+            this.StatusSlot8.Click += new System.EventHandler(this.StatusSlot8_Click);
+            // 
+            // StatusSlot9
+            // 
+            this.StatusSlot9.Name = "StatusSlot9";
+            this.StatusSlot9.Size = new System.Drawing.Size(13, 17);
+            this.StatusSlot9.Text = "9";
+            this.StatusSlot9.Click += new System.EventHandler(this.StatusSlot9_Click);
+            // 
+            // StatusSlot10
+            // 
+            this.StatusSlot10.Name = "StatusSlot10";
+            this.StatusSlot10.Size = new System.Drawing.Size(13, 17);
+            this.StatusSlot10.Text = "0";
+            this.StatusSlot10.Click += new System.EventHandler(this.StatusSlot10_Click);
+            // 
+            // CheatStatus
+            // 
+            this.CheatStatus.Name = "CheatStatus";
+            this.CheatStatus.Size = new System.Drawing.Size(0, 17);
+            // 
+            // contextMenuStrip1
+            // 
+            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.openRomToolStripMenuItem1,
             this.loadLastROMToolStripMenuItem,
             this.toolStripSeparator18,
@@ -2060,173 +2060,173 @@
             this.screenshotToClipboardToolStripMenuItem,
             this.closeROMToolStripMenuItem1,
             this.showMenuToolStripMenuItem});
-			this.contextMenuStrip1.Name = "contextMenuStrip1";
-			this.contextMenuStrip1.Size = new System.Drawing.Size(192, 396);
-			this.contextMenuStrip1.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.contextMenuStrip1_Closing);
-			this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
-			// 
-			// openRomToolStripMenuItem1
-			// 
-			this.openRomToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
-			this.openRomToolStripMenuItem1.Name = "openRomToolStripMenuItem1";
-			this.openRomToolStripMenuItem1.Size = new System.Drawing.Size(191, 22);
-			this.openRomToolStripMenuItem1.Text = "Open Rom";
-			this.openRomToolStripMenuItem1.Click += new System.EventHandler(this.openRomToolStripMenuItem1_Click);
-			// 
-			// loadLastROMToolStripMenuItem
-			// 
-			this.loadLastROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
-			this.loadLastROMToolStripMenuItem.Name = "loadLastROMToolStripMenuItem";
-			this.loadLastROMToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
-			this.loadLastROMToolStripMenuItem.Text = "Load Last ROM";
-			this.loadLastROMToolStripMenuItem.Click += new System.EventHandler(this.loadLastROMToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator18
-			// 
-			this.toolStripSeparator18.Name = "toolStripSeparator18";
-			this.toolStripSeparator18.Size = new System.Drawing.Size(188, 6);
-			// 
-			// recordMovieToolStripMenuItem1
-			// 
-			this.recordMovieToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS;
-			this.recordMovieToolStripMenuItem1.Name = "recordMovieToolStripMenuItem1";
-			this.recordMovieToolStripMenuItem1.Size = new System.Drawing.Size(191, 22);
-			this.recordMovieToolStripMenuItem1.Text = "Record Movie";
-			this.recordMovieToolStripMenuItem1.Click += new System.EventHandler(this.recordMovieToolStripMenuItem1_Click);
-			// 
-			// playMovieToolStripMenuItem1
-			// 
-			this.playMovieToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Play;
-			this.playMovieToolStripMenuItem1.Name = "playMovieToolStripMenuItem1";
-			this.playMovieToolStripMenuItem1.Size = new System.Drawing.Size(191, 22);
-			this.playMovieToolStripMenuItem1.Text = "Play Movie";
-			this.playMovieToolStripMenuItem1.Click += new System.EventHandler(this.playMovieToolStripMenuItem1_Click);
-			// 
-			// restartMovieToolStripMenuItem
-			// 
-			this.restartMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart;
-			this.restartMovieToolStripMenuItem.Name = "restartMovieToolStripMenuItem";
-			this.restartMovieToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
-			this.restartMovieToolStripMenuItem.Text = "Restart Movie";
-			this.restartMovieToolStripMenuItem.Click += new System.EventHandler(this.restartMovieToolStripMenuItem_Click);
-			// 
-			// stopMovieToolStripMenuItem1
-			// 
-			this.stopMovieToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
-			this.stopMovieToolStripMenuItem1.Name = "stopMovieToolStripMenuItem1";
-			this.stopMovieToolStripMenuItem1.Size = new System.Drawing.Size(191, 22);
-			this.stopMovieToolStripMenuItem1.Text = "Stop Movie";
-			this.stopMovieToolStripMenuItem1.Click += new System.EventHandler(this.stopMovieToolStripMenuItem1_Click);
-			// 
-			// loadLastMovieToolStripMenuItem
-			// 
-			this.loadLastMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
-			this.loadLastMovieToolStripMenuItem.Name = "loadLastMovieToolStripMenuItem";
-			this.loadLastMovieToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
-			this.loadLastMovieToolStripMenuItem.Text = "Load Last Movie";
-			this.loadLastMovieToolStripMenuItem.Click += new System.EventHandler(this.loadLastMovieToolStripMenuItem_Click);
-			// 
-			// makeMovieBackupToolStripMenuItem
-			// 
-			this.makeMovieBackupToolStripMenuItem.Name = "makeMovieBackupToolStripMenuItem";
-			this.makeMovieBackupToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
-			this.makeMovieBackupToolStripMenuItem.Text = "Make Movie Backup";
-			this.makeMovieBackupToolStripMenuItem.Click += new System.EventHandler(this.makeMovieBackupToolStripMenuItem_Click);
-			// 
-			// viewSubtitlesToolStripMenuItem
-			// 
-			this.viewSubtitlesToolStripMenuItem.Name = "viewSubtitlesToolStripMenuItem";
-			this.viewSubtitlesToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
-			this.viewSubtitlesToolStripMenuItem.Text = "View Subtitles";
-			this.viewSubtitlesToolStripMenuItem.Click += new System.EventHandler(this.viewSubtitlesToolStripMenuItem_Click);
-			// 
-			// viewCommentsToolStripMenuItem
-			// 
-			this.viewCommentsToolStripMenuItem.Name = "viewCommentsToolStripMenuItem";
-			this.viewCommentsToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
-			this.viewCommentsToolStripMenuItem.Text = "View Comments";
-			this.viewCommentsToolStripMenuItem.Click += new System.EventHandler(this.viewCommentsToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator19
-			// 
-			this.toolStripSeparator19.Name = "toolStripSeparator19";
-			this.toolStripSeparator19.Size = new System.Drawing.Size(188, 6);
-			// 
-			// undoLoadstateToolStripMenuItem
-			// 
-			this.undoLoadstateToolStripMenuItem.Name = "undoLoadstateToolStripMenuItem";
-			this.undoLoadstateToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
-			this.undoLoadstateToolStripMenuItem.Text = "Add Subtitle";
-			this.undoLoadstateToolStripMenuItem.Click += new System.EventHandler(this.AddSubtitleToolStripMenuItem_Click);
-			// 
-			// undoSavestateToolStripMenuItem
-			// 
-			this.undoSavestateToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.undo;
-			this.undoSavestateToolStripMenuItem.Name = "undoSavestateToolStripMenuItem";
-			this.undoSavestateToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
-			this.undoSavestateToolStripMenuItem.Text = "Undo Savestate";
-			this.undoSavestateToolStripMenuItem.Click += new System.EventHandler(this.undoSavestateToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator20
-			// 
-			this.toolStripSeparator20.Name = "toolStripSeparator20";
-			this.toolStripSeparator20.Size = new System.Drawing.Size(188, 6);
-			// 
-			// toolStripMenuItem6
-			// 
-			this.toolStripMenuItem6.Image = global::BizHawk.MultiClient.Properties.Resources.camera;
-			this.toolStripMenuItem6.Name = "toolStripMenuItem6";
-			this.toolStripMenuItem6.Size = new System.Drawing.Size(191, 22);
-			this.toolStripMenuItem6.Text = "Screenshot";
-			// 
-			// screenshotToClipboardToolStripMenuItem
-			// 
-			this.screenshotToClipboardToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera;
-			this.screenshotToClipboardToolStripMenuItem.Name = "screenshotToClipboardToolStripMenuItem";
-			this.screenshotToClipboardToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
-			this.screenshotToClipboardToolStripMenuItem.Text = "Screenshot -> Clipboard";
-			this.screenshotToClipboardToolStripMenuItem.Click += new System.EventHandler(this.screenshotToClipboardToolStripMenuItem_Click);
-			// 
-			// closeROMToolStripMenuItem1
-			// 
-			this.closeROMToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Close;
-			this.closeROMToolStripMenuItem1.Name = "closeROMToolStripMenuItem1";
-			this.closeROMToolStripMenuItem1.Size = new System.Drawing.Size(191, 22);
-			this.closeROMToolStripMenuItem1.Text = "Close ROM";
-			this.closeROMToolStripMenuItem1.Click += new System.EventHandler(this.closeROMToolStripMenuItem1_Click);
-			// 
-			// showMenuToolStripMenuItem
-			// 
-			this.showMenuToolStripMenuItem.Name = "showMenuToolStripMenuItem";
-			this.showMenuToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
-			this.showMenuToolStripMenuItem.Text = "Show Menu";
-			this.showMenuToolStripMenuItem.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click);
-			// 
-			// MainForm
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(470, 408);
-			this.Controls.Add(this.StatusSlot0);
-			this.Controls.Add(this.menuStrip1);
-			this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-			this.MainMenuStrip = this.menuStrip1;
-			this.MaximizeBox = false;
-			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.MouseClick += new System.Windows.Forms.MouseEventHandler(this.MainForm_MouseClick);
-			this.menuStrip1.ResumeLayout(false);
-			this.menuStrip1.PerformLayout();
-			this.StatusSlot0.ResumeLayout(false);
-			this.StatusSlot0.PerformLayout();
-			this.contextMenuStrip1.ResumeLayout(false);
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.contextMenuStrip1.Name = "contextMenuStrip1";
+            this.contextMenuStrip1.Size = new System.Drawing.Size(192, 396);
+            this.contextMenuStrip1.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.contextMenuStrip1_Closing);
+            this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
+            // 
+            // openRomToolStripMenuItem1
+            // 
+            this.openRomToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
+            this.openRomToolStripMenuItem1.Name = "openRomToolStripMenuItem1";
+            this.openRomToolStripMenuItem1.Size = new System.Drawing.Size(191, 22);
+            this.openRomToolStripMenuItem1.Text = "Open Rom";
+            this.openRomToolStripMenuItem1.Click += new System.EventHandler(this.openRomToolStripMenuItem1_Click);
+            // 
+            // loadLastROMToolStripMenuItem
+            // 
+            this.loadLastROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
+            this.loadLastROMToolStripMenuItem.Name = "loadLastROMToolStripMenuItem";
+            this.loadLastROMToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
+            this.loadLastROMToolStripMenuItem.Text = "Load Last ROM";
+            this.loadLastROMToolStripMenuItem.Click += new System.EventHandler(this.loadLastROMToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator18
+            // 
+            this.toolStripSeparator18.Name = "toolStripSeparator18";
+            this.toolStripSeparator18.Size = new System.Drawing.Size(188, 6);
+            // 
+            // recordMovieToolStripMenuItem1
+            // 
+            this.recordMovieToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS;
+            this.recordMovieToolStripMenuItem1.Name = "recordMovieToolStripMenuItem1";
+            this.recordMovieToolStripMenuItem1.Size = new System.Drawing.Size(191, 22);
+            this.recordMovieToolStripMenuItem1.Text = "Record Movie";
+            this.recordMovieToolStripMenuItem1.Click += new System.EventHandler(this.recordMovieToolStripMenuItem1_Click);
+            // 
+            // playMovieToolStripMenuItem1
+            // 
+            this.playMovieToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Play;
+            this.playMovieToolStripMenuItem1.Name = "playMovieToolStripMenuItem1";
+            this.playMovieToolStripMenuItem1.Size = new System.Drawing.Size(191, 22);
+            this.playMovieToolStripMenuItem1.Text = "Play Movie";
+            this.playMovieToolStripMenuItem1.Click += new System.EventHandler(this.playMovieToolStripMenuItem1_Click);
+            // 
+            // restartMovieToolStripMenuItem
+            // 
+            this.restartMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart;
+            this.restartMovieToolStripMenuItem.Name = "restartMovieToolStripMenuItem";
+            this.restartMovieToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
+            this.restartMovieToolStripMenuItem.Text = "Restart Movie";
+            this.restartMovieToolStripMenuItem.Click += new System.EventHandler(this.restartMovieToolStripMenuItem_Click);
+            // 
+            // stopMovieToolStripMenuItem1
+            // 
+            this.stopMovieToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
+            this.stopMovieToolStripMenuItem1.Name = "stopMovieToolStripMenuItem1";
+            this.stopMovieToolStripMenuItem1.Size = new System.Drawing.Size(191, 22);
+            this.stopMovieToolStripMenuItem1.Text = "Stop Movie";
+            this.stopMovieToolStripMenuItem1.Click += new System.EventHandler(this.stopMovieToolStripMenuItem1_Click);
+            // 
+            // loadLastMovieToolStripMenuItem
+            // 
+            this.loadLastMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
+            this.loadLastMovieToolStripMenuItem.Name = "loadLastMovieToolStripMenuItem";
+            this.loadLastMovieToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
+            this.loadLastMovieToolStripMenuItem.Text = "Load Last Movie";
+            this.loadLastMovieToolStripMenuItem.Click += new System.EventHandler(this.loadLastMovieToolStripMenuItem_Click);
+            // 
+            // makeMovieBackupToolStripMenuItem
+            // 
+            this.makeMovieBackupToolStripMenuItem.Name = "makeMovieBackupToolStripMenuItem";
+            this.makeMovieBackupToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
+            this.makeMovieBackupToolStripMenuItem.Text = "Make Movie Backup";
+            this.makeMovieBackupToolStripMenuItem.Click += new System.EventHandler(this.makeMovieBackupToolStripMenuItem_Click);
+            // 
+            // viewSubtitlesToolStripMenuItem
+            // 
+            this.viewSubtitlesToolStripMenuItem.Name = "viewSubtitlesToolStripMenuItem";
+            this.viewSubtitlesToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
+            this.viewSubtitlesToolStripMenuItem.Text = "View Subtitles";
+            this.viewSubtitlesToolStripMenuItem.Click += new System.EventHandler(this.viewSubtitlesToolStripMenuItem_Click);
+            // 
+            // viewCommentsToolStripMenuItem
+            // 
+            this.viewCommentsToolStripMenuItem.Name = "viewCommentsToolStripMenuItem";
+            this.viewCommentsToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
+            this.viewCommentsToolStripMenuItem.Text = "View Comments";
+            this.viewCommentsToolStripMenuItem.Click += new System.EventHandler(this.viewCommentsToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator19
+            // 
+            this.toolStripSeparator19.Name = "toolStripSeparator19";
+            this.toolStripSeparator19.Size = new System.Drawing.Size(188, 6);
+            // 
+            // undoLoadstateToolStripMenuItem
+            // 
+            this.undoLoadstateToolStripMenuItem.Name = "undoLoadstateToolStripMenuItem";
+            this.undoLoadstateToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
+            this.undoLoadstateToolStripMenuItem.Text = "Add Subtitle";
+            this.undoLoadstateToolStripMenuItem.Click += new System.EventHandler(this.AddSubtitleToolStripMenuItem_Click);
+            // 
+            // undoSavestateToolStripMenuItem
+            // 
+            this.undoSavestateToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.undo;
+            this.undoSavestateToolStripMenuItem.Name = "undoSavestateToolStripMenuItem";
+            this.undoSavestateToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
+            this.undoSavestateToolStripMenuItem.Text = "Undo Savestate";
+            this.undoSavestateToolStripMenuItem.Click += new System.EventHandler(this.undoSavestateToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator20
+            // 
+            this.toolStripSeparator20.Name = "toolStripSeparator20";
+            this.toolStripSeparator20.Size = new System.Drawing.Size(188, 6);
+            // 
+            // toolStripMenuItem6
+            // 
+            this.toolStripMenuItem6.Image = global::BizHawk.MultiClient.Properties.Resources.camera;
+            this.toolStripMenuItem6.Name = "toolStripMenuItem6";
+            this.toolStripMenuItem6.Size = new System.Drawing.Size(191, 22);
+            this.toolStripMenuItem6.Text = "Screenshot";
+            // 
+            // screenshotToClipboardToolStripMenuItem
+            // 
+            this.screenshotToClipboardToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera;
+            this.screenshotToClipboardToolStripMenuItem.Name = "screenshotToClipboardToolStripMenuItem";
+            this.screenshotToClipboardToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
+            this.screenshotToClipboardToolStripMenuItem.Text = "Screenshot -> Clipboard";
+            this.screenshotToClipboardToolStripMenuItem.Click += new System.EventHandler(this.screenshotToClipboardToolStripMenuItem_Click);
+            // 
+            // closeROMToolStripMenuItem1
+            // 
+            this.closeROMToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Close;
+            this.closeROMToolStripMenuItem1.Name = "closeROMToolStripMenuItem1";
+            this.closeROMToolStripMenuItem1.Size = new System.Drawing.Size(191, 22);
+            this.closeROMToolStripMenuItem1.Text = "Close ROM";
+            this.closeROMToolStripMenuItem1.Click += new System.EventHandler(this.closeROMToolStripMenuItem1_Click);
+            // 
+            // showMenuToolStripMenuItem
+            // 
+            this.showMenuToolStripMenuItem.Name = "showMenuToolStripMenuItem";
+            this.showMenuToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
+            this.showMenuToolStripMenuItem.Text = "Show Menu";
+            this.showMenuToolStripMenuItem.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click);
+            // 
+            // MainForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(470, 408);
+            this.Controls.Add(this.StatusSlot0);
+            this.Controls.Add(this.menuStrip1);
+            this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.MainMenuStrip = this.menuStrip1;
+            this.MaximizeBox = false;
+            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.MouseClick += new System.Windows.Forms.MouseEventHandler(this.MainForm_MouseClick);
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
+            this.StatusSlot0.ResumeLayout(false);
+            this.StatusSlot0.PerformLayout();
+            this.contextMenuStrip1.ResumeLayout(false);
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
diff --git a/BizHawk.MultiClient/tools/LuaConsole.Designer.cs b/BizHawk.MultiClient/tools/LuaConsole.Designer.cs
index a42ea3e410..b075df7dd7 100644
--- a/BizHawk.MultiClient/tools/LuaConsole.Designer.cs
+++ b/BizHawk.MultiClient/tools/LuaConsole.Designer.cs
@@ -28,151 +28,151 @@
         /// </summary>
         private void InitializeComponent()
         {
-			this.components = new System.ComponentModel.Container();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LuaConsole));
-			this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-			this.toggleScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.editScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.removeScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.insertSeperatorToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-			this.stopAllScriptsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
-			this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.openSessionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
-			this.recentSessionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.noneToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
-			this.clearToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-			this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-			this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.scriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toggleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.removeScriptToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.insertSeparatorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
-			this.moveUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.moveDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
-			this.turnOffAllScriptsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.autoloadConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.disableScriptsOnLoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
-			this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.luaFunctionsListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.OutputBox = new System.Windows.Forms.RichTextBox();
-			this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
-			this.clearToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.NumberOfScripts = new System.Windows.Forms.Label();
-			this.autoloadSessionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStrip1 = new ToolStripEx();
-			this.openToolStripButton = new System.Windows.Forms.ToolStripButton();
-			this.copyToolStripButton = new System.Windows.Forms.ToolStripButton();
-			this.EditToolstripButton = new System.Windows.Forms.ToolStripButton();
-			this.cutToolStripButton = new System.Windows.Forms.ToolStripButton();
-			this.toolStripButtonSeparator = new System.Windows.Forms.ToolStripButton();
-			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-			this.toolStripButtonMoveUp = new System.Windows.Forms.ToolStripButton();
-			this.toolStripButtonMoveDown = new System.Windows.Forms.ToolStripButton();
-			this.LuaListView = new BizHawk.VirtualListView();
-			this.Script = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.PathName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.contextMenuStrip1.SuspendLayout();
-			this.menuStrip1.SuspendLayout();
-			this.contextMenuStrip2.SuspendLayout();
-			this.groupBox1.SuspendLayout();
-			this.toolStrip1.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// contextMenuStrip1
-			// 
-			this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LuaConsole));
+            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.toggleScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.editScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.removeScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.insertSeperatorToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+            this.stopAllScriptsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.openSessionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+            this.recentSessionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.noneToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+            this.clearToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+            this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.scriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toggleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.removeScriptToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.insertSeparatorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+            this.moveUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.moveDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+            this.turnOffAllScriptsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.autoloadConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.autoloadSessionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.disableScriptsOnLoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+            this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.luaFunctionsListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.OutputBox = new System.Windows.Forms.RichTextBox();
+            this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.clearToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.NumberOfScripts = new System.Windows.Forms.Label();
+            this.toolStrip1 = new ToolStripEx();
+            this.openToolStripButton = new System.Windows.Forms.ToolStripButton();
+            this.copyToolStripButton = new System.Windows.Forms.ToolStripButton();
+            this.EditToolstripButton = new System.Windows.Forms.ToolStripButton();
+            this.cutToolStripButton = new System.Windows.Forms.ToolStripButton();
+            this.toolStripButtonSeparator = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripButtonMoveUp = new System.Windows.Forms.ToolStripButton();
+            this.toolStripButtonMoveDown = new System.Windows.Forms.ToolStripButton();
+            this.LuaListView = new BizHawk.VirtualListView();
+            this.Script = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.PathName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.contextMenuStrip1.SuspendLayout();
+            this.menuStrip1.SuspendLayout();
+            this.contextMenuStrip2.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            this.toolStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // contextMenuStrip1
+            // 
+            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toggleScriptToolStripMenuItem,
             this.editScriptToolStripMenuItem,
             this.removeScriptToolStripMenuItem,
             this.insertSeperatorToolStripMenuItem1,
             this.toolStripSeparator4,
             this.stopAllScriptsToolStripMenuItem});
-			this.contextMenuStrip1.Name = "contextMenuStrip1";
-			this.contextMenuStrip1.Size = new System.Drawing.Size(175, 120);
-			this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
-			// 
-			// toggleScriptToolStripMenuItem
-			// 
-			this.toggleScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1;
-			this.toggleScriptToolStripMenuItem.Name = "toggleScriptToolStripMenuItem";
-			this.toggleScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.toggleScriptToolStripMenuItem.Text = "&Toggle";
-			this.toggleScriptToolStripMenuItem.Click += new System.EventHandler(this.toggleScriptToolStripMenuItem_Click);
-			// 
-			// editScriptToolStripMenuItem
-			// 
-			this.editScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS;
-			this.editScriptToolStripMenuItem.Name = "editScriptToolStripMenuItem";
-			this.editScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.editScriptToolStripMenuItem.Text = "&Edit";
-			this.editScriptToolStripMenuItem.Click += new System.EventHandler(this.editScriptToolStripMenuItem_Click);
-			// 
-			// removeScriptToolStripMenuItem
-			// 
-			this.removeScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close;
-			this.removeScriptToolStripMenuItem.Name = "removeScriptToolStripMenuItem";
-			this.removeScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.removeScriptToolStripMenuItem.Text = "&Remove";
-			this.removeScriptToolStripMenuItem.Click += new System.EventHandler(this.removeScriptToolStripMenuItem_Click);
-			// 
-			// insertSeperatorToolStripMenuItem1
-			// 
-			this.insertSeperatorToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator;
-			this.insertSeperatorToolStripMenuItem1.Name = "insertSeperatorToolStripMenuItem1";
-			this.insertSeperatorToolStripMenuItem1.Size = new System.Drawing.Size(174, 22);
-			this.insertSeperatorToolStripMenuItem1.Text = "Insert Seperator";
-			this.insertSeperatorToolStripMenuItem1.Click += new System.EventHandler(this.insertSeperatorToolStripMenuItem1_Click);
-			// 
-			// toolStripSeparator4
-			// 
-			this.toolStripSeparator4.Name = "toolStripSeparator4";
-			this.toolStripSeparator4.Size = new System.Drawing.Size(171, 6);
-			// 
-			// stopAllScriptsToolStripMenuItem
-			// 
-			this.stopAllScriptsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
-			this.stopAllScriptsToolStripMenuItem.Name = "stopAllScriptsToolStripMenuItem";
-			this.stopAllScriptsToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
-			this.stopAllScriptsToolStripMenuItem.Text = "Turn Off All Scripts";
-			this.stopAllScriptsToolStripMenuItem.Click += new System.EventHandler(this.stopAllScriptsToolStripMenuItem_Click);
-			// 
-			// menuStrip1
-			// 
-			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.contextMenuStrip1.Name = "contextMenuStrip1";
+            this.contextMenuStrip1.Size = new System.Drawing.Size(175, 120);
+            this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
+            // 
+            // toggleScriptToolStripMenuItem
+            // 
+            this.toggleScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1;
+            this.toggleScriptToolStripMenuItem.Name = "toggleScriptToolStripMenuItem";
+            this.toggleScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+            this.toggleScriptToolStripMenuItem.Text = "&Toggle";
+            this.toggleScriptToolStripMenuItem.Click += new System.EventHandler(this.toggleScriptToolStripMenuItem_Click);
+            // 
+            // editScriptToolStripMenuItem
+            // 
+            this.editScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS;
+            this.editScriptToolStripMenuItem.Name = "editScriptToolStripMenuItem";
+            this.editScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+            this.editScriptToolStripMenuItem.Text = "&Edit";
+            this.editScriptToolStripMenuItem.Click += new System.EventHandler(this.editScriptToolStripMenuItem_Click);
+            // 
+            // removeScriptToolStripMenuItem
+            // 
+            this.removeScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close;
+            this.removeScriptToolStripMenuItem.Name = "removeScriptToolStripMenuItem";
+            this.removeScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+            this.removeScriptToolStripMenuItem.Text = "&Remove";
+            this.removeScriptToolStripMenuItem.Click += new System.EventHandler(this.removeScriptToolStripMenuItem_Click);
+            // 
+            // insertSeperatorToolStripMenuItem1
+            // 
+            this.insertSeperatorToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator;
+            this.insertSeperatorToolStripMenuItem1.Name = "insertSeperatorToolStripMenuItem1";
+            this.insertSeperatorToolStripMenuItem1.Size = new System.Drawing.Size(174, 22);
+            this.insertSeperatorToolStripMenuItem1.Text = "Insert Seperator";
+            this.insertSeperatorToolStripMenuItem1.Click += new System.EventHandler(this.insertSeperatorToolStripMenuItem1_Click);
+            // 
+            // toolStripSeparator4
+            // 
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
+            this.toolStripSeparator4.Size = new System.Drawing.Size(171, 6);
+            // 
+            // stopAllScriptsToolStripMenuItem
+            // 
+            this.stopAllScriptsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
+            this.stopAllScriptsToolStripMenuItem.Name = "stopAllScriptsToolStripMenuItem";
+            this.stopAllScriptsToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+            this.stopAllScriptsToolStripMenuItem.Text = "Turn Off All Scripts";
+            this.stopAllScriptsToolStripMenuItem.Click += new System.EventHandler(this.stopAllScriptsToolStripMenuItem_Click);
+            // 
+            // menuStrip1
+            // 
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.fileToolStripMenuItem,
             this.scriptToolStripMenuItem,
             this.optionsToolStripMenuItem,
             this.helpToolStripMenuItem});
-			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-			this.menuStrip1.Name = "menuStrip1";
-			this.menuStrip1.Size = new System.Drawing.Size(584, 24);
-			this.menuStrip1.TabIndex = 1;
-			this.menuStrip1.Text = "menuStrip1";
-			// 
-			// fileToolStripMenuItem
-			// 
-			this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Size = new System.Drawing.Size(584, 24);
+            this.menuStrip1.TabIndex = 1;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
+            // fileToolStripMenuItem
+            // 
+            this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.newToolStripMenuItem,
             this.openSessionToolStripMenuItem,
             this.saveToolStripMenuItem,
@@ -182,126 +182,126 @@
             this.recentToolStripMenuItem,
             this.toolStripSeparator1,
             this.exitToolStripMenuItem});
-			this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-			this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
-			this.fileToolStripMenuItem.Text = "&File";
-			this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened);
-			// 
-			// newToolStripMenuItem
-			// 
-			this.newToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.NewFile;
-			this.newToolStripMenuItem.Name = "newToolStripMenuItem";
-			this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
-			this.newToolStripMenuItem.Size = new System.Drawing.Size(237, 22);
-			this.newToolStripMenuItem.Text = "&New Session";
-			this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
-			// 
-			// openSessionToolStripMenuItem
-			// 
-			this.openSessionToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
-			this.openSessionToolStripMenuItem.Name = "openSessionToolStripMenuItem";
-			this.openSessionToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
+            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+            this.fileToolStripMenuItem.Text = "&File";
+            this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened);
+            // 
+            // newToolStripMenuItem
+            // 
+            this.newToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.NewFile;
+            this.newToolStripMenuItem.Name = "newToolStripMenuItem";
+            this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
+            this.newToolStripMenuItem.Size = new System.Drawing.Size(237, 22);
+            this.newToolStripMenuItem.Text = "&New Session";
+            this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
+            // 
+            // openSessionToolStripMenuItem
+            // 
+            this.openSessionToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
+            this.openSessionToolStripMenuItem.Name = "openSessionToolStripMenuItem";
+            this.openSessionToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
             | System.Windows.Forms.Keys.O)));
-			this.openSessionToolStripMenuItem.Size = new System.Drawing.Size(237, 22);
-			this.openSessionToolStripMenuItem.Text = "&Open Session...";
-			this.openSessionToolStripMenuItem.Click += new System.EventHandler(this.openSessionToolStripMenuItem_Click);
-			// 
-			// saveToolStripMenuItem
-			// 
-			this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs;
-			this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-			this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
-			this.saveToolStripMenuItem.Size = new System.Drawing.Size(237, 22);
-			this.saveToolStripMenuItem.Text = "&Save Session";
-			this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
-			// 
-			// saveAsToolStripMenuItem
-			// 
-			this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
-			this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
+            this.openSessionToolStripMenuItem.Size = new System.Drawing.Size(237, 22);
+            this.openSessionToolStripMenuItem.Text = "&Open Session...";
+            this.openSessionToolStripMenuItem.Click += new System.EventHandler(this.openSessionToolStripMenuItem_Click);
+            // 
+            // saveToolStripMenuItem
+            // 
+            this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs;
+            this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
+            this.saveToolStripMenuItem.Size = new System.Drawing.Size(237, 22);
+            this.saveToolStripMenuItem.Text = "&Save Session";
+            this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
+            // 
+            // saveAsToolStripMenuItem
+            // 
+            this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
+            this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
             | System.Windows.Forms.Keys.S)));
-			this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(237, 22);
-			this.saveAsToolStripMenuItem.Text = "Save Session &As...";
-			this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator9
-			// 
-			this.toolStripSeparator9.Name = "toolStripSeparator9";
-			this.toolStripSeparator9.Size = new System.Drawing.Size(234, 6);
-			// 
-			// recentSessionsToolStripMenuItem
-			// 
-			this.recentSessionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(237, 22);
+            this.saveAsToolStripMenuItem.Text = "Save Session &As...";
+            this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator9
+            // 
+            this.toolStripSeparator9.Name = "toolStripSeparator9";
+            this.toolStripSeparator9.Size = new System.Drawing.Size(234, 6);
+            // 
+            // recentSessionsToolStripMenuItem
+            // 
+            this.recentSessionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.noneToolStripMenuItem1,
             this.toolStripSeparator8,
             this.clearToolStripMenuItem1});
-			this.recentSessionsToolStripMenuItem.Name = "recentSessionsToolStripMenuItem";
-			this.recentSessionsToolStripMenuItem.Size = new System.Drawing.Size(237, 22);
-			this.recentSessionsToolStripMenuItem.Text = "Recent Sessions";
-			this.recentSessionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentSessionsToolStripMenuItem_DropDownOpened);
-			// 
-			// noneToolStripMenuItem1
-			// 
-			this.noneToolStripMenuItem1.Name = "noneToolStripMenuItem1";
-			this.noneToolStripMenuItem1.Size = new System.Drawing.Size(103, 22);
-			this.noneToolStripMenuItem1.Text = "None";
-			// 
-			// toolStripSeparator8
-			// 
-			this.toolStripSeparator8.Name = "toolStripSeparator8";
-			this.toolStripSeparator8.Size = new System.Drawing.Size(100, 6);
-			// 
-			// clearToolStripMenuItem1
-			// 
-			this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1";
-			this.clearToolStripMenuItem1.Size = new System.Drawing.Size(103, 22);
-			this.clearToolStripMenuItem1.Text = "Clear";
-			// 
-			// recentToolStripMenuItem
-			// 
-			this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.recentSessionsToolStripMenuItem.Name = "recentSessionsToolStripMenuItem";
+            this.recentSessionsToolStripMenuItem.Size = new System.Drawing.Size(237, 22);
+            this.recentSessionsToolStripMenuItem.Text = "Recent Sessions";
+            this.recentSessionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentSessionsToolStripMenuItem_DropDownOpened);
+            // 
+            // noneToolStripMenuItem1
+            // 
+            this.noneToolStripMenuItem1.Name = "noneToolStripMenuItem1";
+            this.noneToolStripMenuItem1.Size = new System.Drawing.Size(103, 22);
+            this.noneToolStripMenuItem1.Text = "None";
+            // 
+            // toolStripSeparator8
+            // 
+            this.toolStripSeparator8.Name = "toolStripSeparator8";
+            this.toolStripSeparator8.Size = new System.Drawing.Size(100, 6);
+            // 
+            // clearToolStripMenuItem1
+            // 
+            this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1";
+            this.clearToolStripMenuItem1.Size = new System.Drawing.Size(103, 22);
+            this.clearToolStripMenuItem1.Text = "Clear";
+            // 
+            // recentToolStripMenuItem
+            // 
+            this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.noneToolStripMenuItem,
             this.toolStripSeparator3,
             this.clearToolStripMenuItem});
-			this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
-			this.recentToolStripMenuItem.Name = "recentToolStripMenuItem";
-			this.recentToolStripMenuItem.Size = new System.Drawing.Size(237, 22);
-			this.recentToolStripMenuItem.Text = "Recent Scripts";
-			this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened);
-			// 
-			// noneToolStripMenuItem
-			// 
-			this.noneToolStripMenuItem.Name = "noneToolStripMenuItem";
-			this.noneToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
-			this.noneToolStripMenuItem.Text = "None";
-			// 
-			// toolStripSeparator3
-			// 
-			this.toolStripSeparator3.Name = "toolStripSeparator3";
-			this.toolStripSeparator3.Size = new System.Drawing.Size(100, 6);
-			// 
-			// clearToolStripMenuItem
-			// 
-			this.clearToolStripMenuItem.Name = "clearToolStripMenuItem";
-			this.clearToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
-			this.clearToolStripMenuItem.Text = "Clear";
-			// 
-			// toolStripSeparator1
-			// 
-			this.toolStripSeparator1.Name = "toolStripSeparator1";
-			this.toolStripSeparator1.Size = new System.Drawing.Size(234, 6);
-			// 
-			// exitToolStripMenuItem
-			// 
-			this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
-			this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
-			this.exitToolStripMenuItem.Size = new System.Drawing.Size(237, 22);
-			this.exitToolStripMenuItem.Text = "E&xit";
-			this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
-			// 
-			// scriptToolStripMenuItem
-			// 
-			this.scriptToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
+            this.recentToolStripMenuItem.Name = "recentToolStripMenuItem";
+            this.recentToolStripMenuItem.Size = new System.Drawing.Size(237, 22);
+            this.recentToolStripMenuItem.Text = "Recent Scripts";
+            this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened);
+            // 
+            // noneToolStripMenuItem
+            // 
+            this.noneToolStripMenuItem.Name = "noneToolStripMenuItem";
+            this.noneToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.noneToolStripMenuItem.Text = "None";
+            // 
+            // toolStripSeparator3
+            // 
+            this.toolStripSeparator3.Name = "toolStripSeparator3";
+            this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
+            // 
+            // clearToolStripMenuItem
+            // 
+            this.clearToolStripMenuItem.Name = "clearToolStripMenuItem";
+            this.clearToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.clearToolStripMenuItem.Text = "Clear";
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(234, 6);
+            // 
+            // exitToolStripMenuItem
+            // 
+            this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
+            this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
+            this.exitToolStripMenuItem.Size = new System.Drawing.Size(237, 22);
+            this.exitToolStripMenuItem.Text = "E&xit";
+            this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
+            // 
+            // scriptToolStripMenuItem
+            // 
+            this.scriptToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.openToolStripMenuItem,
             this.toggleToolStripMenuItem,
             this.editToolStripMenuItem,
@@ -313,217 +313,217 @@
             this.selectAllToolStripMenuItem,
             this.toolStripSeparator6,
             this.turnOffAllScriptsToolStripMenuItem});
-			this.scriptToolStripMenuItem.Name = "scriptToolStripMenuItem";
-			this.scriptToolStripMenuItem.Size = new System.Drawing.Size(49, 20);
-			this.scriptToolStripMenuItem.Text = "&Script";
-			this.scriptToolStripMenuItem.DropDownOpened += new System.EventHandler(this.scriptToolStripMenuItem_DropDownOpened);
-			// 
-			// openToolStripMenuItem
-			// 
-			this.openToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
-			this.openToolStripMenuItem.Name = "openToolStripMenuItem";
-			this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
-			this.openToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
-			this.openToolStripMenuItem.Text = "&Open Script...";
-			this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click_1);
-			// 
-			// toggleToolStripMenuItem
-			// 
-			this.toggleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1;
-			this.toggleToolStripMenuItem.Name = "toggleToolStripMenuItem";
-			this.toggleToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T)));
-			this.toggleToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
-			this.toggleToolStripMenuItem.Text = "&Toggle";
-			this.toggleToolStripMenuItem.Click += new System.EventHandler(this.toggleToolStripMenuItem_Click);
-			// 
-			// editToolStripMenuItem
-			// 
-			this.editToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS;
-			this.editToolStripMenuItem.Name = "editToolStripMenuItem";
-			this.editToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
-			this.editToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
-			this.editToolStripMenuItem.Text = "&Edit Script";
-			this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click);
-			// 
-			// removeScriptToolStripMenuItem1
-			// 
-			this.removeScriptToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Delete;
-			this.removeScriptToolStripMenuItem1.Name = "removeScriptToolStripMenuItem1";
-			this.removeScriptToolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R)));
-			this.removeScriptToolStripMenuItem1.Size = new System.Drawing.Size(195, 22);
-			this.removeScriptToolStripMenuItem1.Text = "&Remove Watch";
-			this.removeScriptToolStripMenuItem1.Click += new System.EventHandler(this.removeScriptToolStripMenuItem_Click);
-			// 
-			// insertSeparatorToolStripMenuItem
-			// 
-			this.insertSeparatorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator;
-			this.insertSeparatorToolStripMenuItem.Name = "insertSeparatorToolStripMenuItem";
-			this.insertSeparatorToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I)));
-			this.insertSeparatorToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
-			this.insertSeparatorToolStripMenuItem.Text = "Insert Separator";
-			this.insertSeparatorToolStripMenuItem.Click += new System.EventHandler(this.insertSeperatorToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator7
-			// 
-			this.toolStripSeparator7.Name = "toolStripSeparator7";
-			this.toolStripSeparator7.Size = new System.Drawing.Size(192, 6);
-			// 
-			// moveUpToolStripMenuItem
-			// 
-			this.moveUpToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp;
-			this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem";
-			this.moveUpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U)));
-			this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
-			this.moveUpToolStripMenuItem.Text = "Move &Up";
-			this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click_1);
-			// 
-			// moveDownToolStripMenuItem
-			// 
-			this.moveDownToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown;
-			this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem";
-			this.moveDownToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
-			this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
-			this.moveDownToolStripMenuItem.Text = "Move &Down";
-			this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click_1);
-			// 
-			// selectAllToolStripMenuItem
-			// 
-			this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
-			this.selectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
-			this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
-			this.selectAllToolStripMenuItem.Text = "Select &All";
-			this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator6
-			// 
-			this.toolStripSeparator6.Name = "toolStripSeparator6";
-			this.toolStripSeparator6.Size = new System.Drawing.Size(192, 6);
-			// 
-			// turnOffAllScriptsToolStripMenuItem
-			// 
-			this.turnOffAllScriptsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
-			this.turnOffAllScriptsToolStripMenuItem.Name = "turnOffAllScriptsToolStripMenuItem";
-			this.turnOffAllScriptsToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
-			this.turnOffAllScriptsToolStripMenuItem.Text = "Turn Off All Scripts";
-			this.turnOffAllScriptsToolStripMenuItem.Click += new System.EventHandler(this.turnOffAllScriptsToolStripMenuItem_Click);
-			// 
-			// optionsToolStripMenuItem
-			// 
-			this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.scriptToolStripMenuItem.Name = "scriptToolStripMenuItem";
+            this.scriptToolStripMenuItem.Size = new System.Drawing.Size(49, 20);
+            this.scriptToolStripMenuItem.Text = "&Script";
+            this.scriptToolStripMenuItem.DropDownOpened += new System.EventHandler(this.scriptToolStripMenuItem_DropDownOpened);
+            // 
+            // openToolStripMenuItem
+            // 
+            this.openToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
+            this.openToolStripMenuItem.Name = "openToolStripMenuItem";
+            this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
+            this.openToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
+            this.openToolStripMenuItem.Text = "&Open Script...";
+            this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click_1);
+            // 
+            // toggleToolStripMenuItem
+            // 
+            this.toggleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1;
+            this.toggleToolStripMenuItem.Name = "toggleToolStripMenuItem";
+            this.toggleToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T)));
+            this.toggleToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
+            this.toggleToolStripMenuItem.Text = "&Toggle";
+            this.toggleToolStripMenuItem.Click += new System.EventHandler(this.toggleToolStripMenuItem_Click);
+            // 
+            // editToolStripMenuItem
+            // 
+            this.editToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS;
+            this.editToolStripMenuItem.Name = "editToolStripMenuItem";
+            this.editToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
+            this.editToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
+            this.editToolStripMenuItem.Text = "&Edit Script";
+            this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click);
+            // 
+            // removeScriptToolStripMenuItem1
+            // 
+            this.removeScriptToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Delete;
+            this.removeScriptToolStripMenuItem1.Name = "removeScriptToolStripMenuItem1";
+            this.removeScriptToolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R)));
+            this.removeScriptToolStripMenuItem1.Size = new System.Drawing.Size(195, 22);
+            this.removeScriptToolStripMenuItem1.Text = "&Remove Watch";
+            this.removeScriptToolStripMenuItem1.Click += new System.EventHandler(this.removeScriptToolStripMenuItem_Click);
+            // 
+            // insertSeparatorToolStripMenuItem
+            // 
+            this.insertSeparatorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator;
+            this.insertSeparatorToolStripMenuItem.Name = "insertSeparatorToolStripMenuItem";
+            this.insertSeparatorToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I)));
+            this.insertSeparatorToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
+            this.insertSeparatorToolStripMenuItem.Text = "Insert Separator";
+            this.insertSeparatorToolStripMenuItem.Click += new System.EventHandler(this.insertSeperatorToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator7
+            // 
+            this.toolStripSeparator7.Name = "toolStripSeparator7";
+            this.toolStripSeparator7.Size = new System.Drawing.Size(192, 6);
+            // 
+            // moveUpToolStripMenuItem
+            // 
+            this.moveUpToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp;
+            this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem";
+            this.moveUpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U)));
+            this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
+            this.moveUpToolStripMenuItem.Text = "Move &Up";
+            this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click_1);
+            // 
+            // moveDownToolStripMenuItem
+            // 
+            this.moveDownToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown;
+            this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem";
+            this.moveDownToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
+            this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
+            this.moveDownToolStripMenuItem.Text = "Move &Down";
+            this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click_1);
+            // 
+            // selectAllToolStripMenuItem
+            // 
+            this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
+            this.selectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
+            this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
+            this.selectAllToolStripMenuItem.Text = "Select &All";
+            this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator6
+            // 
+            this.toolStripSeparator6.Name = "toolStripSeparator6";
+            this.toolStripSeparator6.Size = new System.Drawing.Size(192, 6);
+            // 
+            // turnOffAllScriptsToolStripMenuItem
+            // 
+            this.turnOffAllScriptsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
+            this.turnOffAllScriptsToolStripMenuItem.Name = "turnOffAllScriptsToolStripMenuItem";
+            this.turnOffAllScriptsToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
+            this.turnOffAllScriptsToolStripMenuItem.Text = "Turn Off All Scripts";
+            this.turnOffAllScriptsToolStripMenuItem.Click += new System.EventHandler(this.turnOffAllScriptsToolStripMenuItem_Click);
+            // 
+            // optionsToolStripMenuItem
+            // 
+            this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.saveWindowPositionToolStripMenuItem,
             this.autoloadConsoleToolStripMenuItem,
             this.autoloadSessionToolStripMenuItem,
             this.disableScriptsOnLoadToolStripMenuItem,
             this.toolStripSeparator5,
             this.restoreWindowSizeToolStripMenuItem});
-			this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
-			this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
-			this.optionsToolStripMenuItem.Text = "&Options";
-			this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened);
-			// 
-			// saveWindowPositionToolStripMenuItem
-			// 
-			this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem";
-			this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
-			this.saveWindowPositionToolStripMenuItem.Text = "Save Window Position";
-			this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click);
-			// 
-			// autoloadConsoleToolStripMenuItem
-			// 
-			this.autoloadConsoleToolStripMenuItem.Name = "autoloadConsoleToolStripMenuItem";
-			this.autoloadConsoleToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
-			this.autoloadConsoleToolStripMenuItem.Text = "Autoload Console";
-			this.autoloadConsoleToolStripMenuItem.Click += new System.EventHandler(this.autoloadConsoleToolStripMenuItem_Click);
-			// 
-			// disableScriptsOnLoadToolStripMenuItem
-			// 
-			this.disableScriptsOnLoadToolStripMenuItem.Name = "disableScriptsOnLoadToolStripMenuItem";
-			this.disableScriptsOnLoadToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
-			this.disableScriptsOnLoadToolStripMenuItem.Text = "Disable Scripts on Load";
-			this.disableScriptsOnLoadToolStripMenuItem.Click += new System.EventHandler(this.disableScriptsOnLoadToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator5
-			// 
-			this.toolStripSeparator5.Name = "toolStripSeparator5";
-			this.toolStripSeparator5.Size = new System.Drawing.Size(196, 6);
-			// 
-			// restoreWindowSizeToolStripMenuItem
-			// 
-			this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem";
-			this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
-			this.restoreWindowSizeToolStripMenuItem.Text = "Restore Default Settings";
-			this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click);
-			// 
-			// helpToolStripMenuItem
-			// 
-			this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
+            this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
+            this.optionsToolStripMenuItem.Text = "&Options";
+            this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened);
+            // 
+            // saveWindowPositionToolStripMenuItem
+            // 
+            this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem";
+            this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
+            this.saveWindowPositionToolStripMenuItem.Text = "Save Window Position";
+            this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click);
+            // 
+            // autoloadConsoleToolStripMenuItem
+            // 
+            this.autoloadConsoleToolStripMenuItem.Name = "autoloadConsoleToolStripMenuItem";
+            this.autoloadConsoleToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
+            this.autoloadConsoleToolStripMenuItem.Text = "Autoload Console";
+            this.autoloadConsoleToolStripMenuItem.Click += new System.EventHandler(this.autoloadConsoleToolStripMenuItem_Click);
+            // 
+            // autoloadSessionToolStripMenuItem
+            // 
+            this.autoloadSessionToolStripMenuItem.Name = "autoloadSessionToolStripMenuItem";
+            this.autoloadSessionToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
+            this.autoloadSessionToolStripMenuItem.Text = "Autoload Session";
+            this.autoloadSessionToolStripMenuItem.Click += new System.EventHandler(this.autoloadSessionToolStripMenuItem_Click);
+            // 
+            // disableScriptsOnLoadToolStripMenuItem
+            // 
+            this.disableScriptsOnLoadToolStripMenuItem.Name = "disableScriptsOnLoadToolStripMenuItem";
+            this.disableScriptsOnLoadToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
+            this.disableScriptsOnLoadToolStripMenuItem.Text = "Disable Scripts on Load";
+            this.disableScriptsOnLoadToolStripMenuItem.Click += new System.EventHandler(this.disableScriptsOnLoadToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator5
+            // 
+            this.toolStripSeparator5.Name = "toolStripSeparator5";
+            this.toolStripSeparator5.Size = new System.Drawing.Size(196, 6);
+            // 
+            // restoreWindowSizeToolStripMenuItem
+            // 
+            this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem";
+            this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
+            this.restoreWindowSizeToolStripMenuItem.Text = "Restore Default Settings";
+            this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click);
+            // 
+            // helpToolStripMenuItem
+            // 
+            this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.luaFunctionsListToolStripMenuItem});
-			this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
-			this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
-			this.helpToolStripMenuItem.Text = "&Help";
-			// 
-			// luaFunctionsListToolStripMenuItem
-			// 
-			this.luaFunctionsListToolStripMenuItem.Name = "luaFunctionsListToolStripMenuItem";
-			this.luaFunctionsListToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
-			this.luaFunctionsListToolStripMenuItem.Text = "&Lua Functions List";
-			this.luaFunctionsListToolStripMenuItem.Click += new System.EventHandler(this.luaFunctionsListToolStripMenuItem_Click);
-			// 
-			// OutputBox
-			// 
-			this.OutputBox.ContextMenuStrip = this.contextMenuStrip2;
-			this.OutputBox.Location = new System.Drawing.Point(6, 17);
-			this.OutputBox.Name = "OutputBox";
-			this.OutputBox.ReadOnly = true;
-			this.OutputBox.Size = new System.Drawing.Size(246, 259);
-			this.OutputBox.TabIndex = 2;
-			this.OutputBox.Text = "";
-			// 
-			// contextMenuStrip2
-			// 
-			this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
+            this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+            this.helpToolStripMenuItem.Text = "&Help";
+            // 
+            // luaFunctionsListToolStripMenuItem
+            // 
+            this.luaFunctionsListToolStripMenuItem.Name = "luaFunctionsListToolStripMenuItem";
+            this.luaFunctionsListToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
+            this.luaFunctionsListToolStripMenuItem.Text = "&Lua Functions List";
+            this.luaFunctionsListToolStripMenuItem.Click += new System.EventHandler(this.luaFunctionsListToolStripMenuItem_Click);
+            // 
+            // OutputBox
+            // 
+            this.OutputBox.ContextMenuStrip = this.contextMenuStrip2;
+            this.OutputBox.Location = new System.Drawing.Point(6, 17);
+            this.OutputBox.Name = "OutputBox";
+            this.OutputBox.ReadOnly = true;
+            this.OutputBox.Size = new System.Drawing.Size(246, 259);
+            this.OutputBox.TabIndex = 2;
+            this.OutputBox.Text = "";
+            // 
+            // contextMenuStrip2
+            // 
+            this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.clearToolStripMenuItem2});
-			this.contextMenuStrip2.Name = "contextMenuStrip2";
-			this.contextMenuStrip2.Size = new System.Drawing.Size(102, 26);
-			// 
-			// clearToolStripMenuItem2
-			// 
-			this.clearToolStripMenuItem2.Name = "clearToolStripMenuItem2";
-			this.clearToolStripMenuItem2.Size = new System.Drawing.Size(101, 22);
-			this.clearToolStripMenuItem2.Text = "&Clear";
-			this.clearToolStripMenuItem2.Click += new System.EventHandler(this.clearToolStripMenuItem2_Click);
-			// 
-			// groupBox1
-			// 
-			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.groupBox1.Controls.Add(this.OutputBox);
-			this.groupBox1.Location = new System.Drawing.Point(310, 71);
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(258, 280);
-			this.groupBox1.TabIndex = 3;
-			this.groupBox1.TabStop = false;
-			this.groupBox1.Text = "Output";
-			// 
-			// NumberOfScripts
-			// 
-			this.NumberOfScripts.AutoSize = true;
-			this.NumberOfScripts.Location = new System.Drawing.Point(10, 53);
-			this.NumberOfScripts.Name = "NumberOfScripts";
-			this.NumberOfScripts.Size = new System.Drawing.Size(66, 13);
-			this.NumberOfScripts.TabIndex = 4;
-			this.NumberOfScripts.Text = " 0 Scripts     ";
-			// 
-			// autoloadSessionToolStripMenuItem
-			// 
-			this.autoloadSessionToolStripMenuItem.Name = "autoloadSessionToolStripMenuItem";
-			this.autoloadSessionToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
-			this.autoloadSessionToolStripMenuItem.Text = "Autoload Session";
-			this.autoloadSessionToolStripMenuItem.Click += new System.EventHandler(this.autoloadSessionToolStripMenuItem_Click);
-			// 
-			// toolStrip1
-			// 
-			this.toolStrip1.ClickThrough = true;
-			this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.contextMenuStrip2.Name = "contextMenuStrip2";
+            this.contextMenuStrip2.Size = new System.Drawing.Size(102, 26);
+            // 
+            // clearToolStripMenuItem2
+            // 
+            this.clearToolStripMenuItem2.Name = "clearToolStripMenuItem2";
+            this.clearToolStripMenuItem2.Size = new System.Drawing.Size(101, 22);
+            this.clearToolStripMenuItem2.Text = "&Clear";
+            this.clearToolStripMenuItem2.Click += new System.EventHandler(this.clearToolStripMenuItem2_Click);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox1.Controls.Add(this.OutputBox);
+            this.groupBox1.Location = new System.Drawing.Point(310, 71);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(258, 280);
+            this.groupBox1.TabIndex = 3;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Output";
+            // 
+            // NumberOfScripts
+            // 
+            this.NumberOfScripts.AutoSize = true;
+            this.NumberOfScripts.Location = new System.Drawing.Point(10, 53);
+            this.NumberOfScripts.Name = "NumberOfScripts";
+            this.NumberOfScripts.Size = new System.Drawing.Size(66, 13);
+            this.NumberOfScripts.TabIndex = 4;
+            this.NumberOfScripts.Text = " 0 Scripts     ";
+            // 
+            // toolStrip1
+            // 
+            this.toolStrip1.ClickThrough = true;
+            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.openToolStripButton,
             this.copyToolStripButton,
             this.EditToolstripButton,
@@ -532,148 +532,146 @@
             this.toolStripSeparator2,
             this.toolStripButtonMoveUp,
             this.toolStripButtonMoveDown});
-			this.toolStrip1.Location = new System.Drawing.Point(0, 24);
-			this.toolStrip1.Name = "toolStrip1";
-			this.toolStrip1.Size = new System.Drawing.Size(584, 25);
-			this.toolStrip1.TabIndex = 5;
-			this.toolStrip1.Text = "toolStrip1";
-			// 
-			// openToolStripButton
-			// 
-			this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image")));
-			this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.openToolStripButton.Name = "openToolStripButton";
-			this.openToolStripButton.Size = new System.Drawing.Size(23, 22);
-			this.openToolStripButton.Text = "Open Script";
-			this.openToolStripButton.Click += new System.EventHandler(this.openToolStripButton_Click);
-			// 
-			// copyToolStripButton
-			// 
-			this.copyToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.copyToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1;
-			this.copyToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.copyToolStripButton.Name = "copyToolStripButton";
-			this.copyToolStripButton.Size = new System.Drawing.Size(23, 22);
-			this.copyToolStripButton.Text = "Toggle Script";
-			this.copyToolStripButton.Click += new System.EventHandler(this.copyToolStripButton_Click);
-			// 
-			// EditToolstripButton
-			// 
-			this.EditToolstripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.EditToolstripButton.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS;
-			this.EditToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.EditToolstripButton.Name = "EditToolstripButton";
-			this.EditToolstripButton.Size = new System.Drawing.Size(23, 22);
-			this.EditToolstripButton.Text = "Edit Script";
-			this.EditToolstripButton.Click += new System.EventHandler(this.EditToolstripButton_Click);
-			// 
-			// cutToolStripButton
-			// 
-			this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.cutToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.Delete;
-			this.cutToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.cutToolStripButton.Name = "cutToolStripButton";
-			this.cutToolStripButton.Size = new System.Drawing.Size(23, 22);
-			this.cutToolStripButton.Text = "Remove Script";
-			this.cutToolStripButton.Click += new System.EventHandler(this.cutToolStripButton_Click);
-			// 
-			// toolStripButtonSeparator
-			// 
-			this.toolStripButtonSeparator.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.toolStripButtonSeparator.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator;
-			this.toolStripButtonSeparator.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.toolStripButtonSeparator.Name = "toolStripButtonSeparator";
-			this.toolStripButtonSeparator.Size = new System.Drawing.Size(23, 22);
-			this.toolStripButtonSeparator.Text = "Insert Separator";
-			this.toolStripButtonSeparator.Click += new System.EventHandler(this.toolStripButtonSeparator_Click);
-			// 
-			// toolStripSeparator2
-			// 
-			this.toolStripSeparator2.Name = "toolStripSeparator2";
-			this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
-			// 
-			// toolStripButtonMoveUp
-			// 
-			this.toolStripButtonMoveUp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.toolStripButtonMoveUp.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp;
-			this.toolStripButtonMoveUp.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.toolStripButtonMoveUp.Name = "toolStripButtonMoveUp";
-			this.toolStripButtonMoveUp.Size = new System.Drawing.Size(23, 22);
-			this.toolStripButtonMoveUp.Text = "Move Up";
-			this.toolStripButtonMoveUp.Click += new System.EventHandler(this.toolStripButtonMoveUp_Click);
-			// 
-			// toolStripButtonMoveDown
-			// 
-			this.toolStripButtonMoveDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.toolStripButtonMoveDown.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown;
-			this.toolStripButtonMoveDown.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.toolStripButtonMoveDown.Name = "toolStripButtonMoveDown";
-			this.toolStripButtonMoveDown.Size = new System.Drawing.Size(23, 22);
-			this.toolStripButtonMoveDown.Text = "Move Down";
-			this.toolStripButtonMoveDown.Click += new System.EventHandler(this.toolStripButtonMoveDown_Click);
-			// 
-			// LuaListView
-			// 
-			this.LuaListView.CheckBoxes = true;
-			this.LuaListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.toolStrip1.Location = new System.Drawing.Point(0, 24);
+            this.toolStrip1.Name = "toolStrip1";
+            this.toolStrip1.Size = new System.Drawing.Size(584, 25);
+            this.toolStrip1.TabIndex = 5;
+            this.toolStrip1.Text = "toolStrip1";
+            // 
+            // openToolStripButton
+            // 
+            this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image")));
+            this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.openToolStripButton.Name = "openToolStripButton";
+            this.openToolStripButton.Size = new System.Drawing.Size(23, 22);
+            this.openToolStripButton.Text = "Open Script";
+            this.openToolStripButton.Click += new System.EventHandler(this.openToolStripButton_Click);
+            // 
+            // copyToolStripButton
+            // 
+            this.copyToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.copyToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1;
+            this.copyToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.copyToolStripButton.Name = "copyToolStripButton";
+            this.copyToolStripButton.Size = new System.Drawing.Size(23, 22);
+            this.copyToolStripButton.Text = "Toggle Script";
+            this.copyToolStripButton.Click += new System.EventHandler(this.copyToolStripButton_Click);
+            // 
+            // EditToolstripButton
+            // 
+            this.EditToolstripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.EditToolstripButton.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS;
+            this.EditToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.EditToolstripButton.Name = "EditToolstripButton";
+            this.EditToolstripButton.Size = new System.Drawing.Size(23, 22);
+            this.EditToolstripButton.Text = "Edit Script";
+            this.EditToolstripButton.Click += new System.EventHandler(this.EditToolstripButton_Click);
+            // 
+            // cutToolStripButton
+            // 
+            this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.cutToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.Delete;
+            this.cutToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.cutToolStripButton.Name = "cutToolStripButton";
+            this.cutToolStripButton.Size = new System.Drawing.Size(23, 22);
+            this.cutToolStripButton.Text = "Remove Script";
+            this.cutToolStripButton.Click += new System.EventHandler(this.cutToolStripButton_Click);
+            // 
+            // toolStripButtonSeparator
+            // 
+            this.toolStripButtonSeparator.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButtonSeparator.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator;
+            this.toolStripButtonSeparator.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButtonSeparator.Name = "toolStripButtonSeparator";
+            this.toolStripButtonSeparator.Size = new System.Drawing.Size(23, 22);
+            this.toolStripButtonSeparator.Text = "Insert Separator";
+            this.toolStripButtonSeparator.Click += new System.EventHandler(this.toolStripButtonSeparator_Click);
+            // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
+            // 
+            // toolStripButtonMoveUp
+            // 
+            this.toolStripButtonMoveUp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButtonMoveUp.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp;
+            this.toolStripButtonMoveUp.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButtonMoveUp.Name = "toolStripButtonMoveUp";
+            this.toolStripButtonMoveUp.Size = new System.Drawing.Size(23, 22);
+            this.toolStripButtonMoveUp.Text = "Move Up";
+            this.toolStripButtonMoveUp.Click += new System.EventHandler(this.toolStripButtonMoveUp_Click);
+            // 
+            // toolStripButtonMoveDown
+            // 
+            this.toolStripButtonMoveDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButtonMoveDown.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown;
+            this.toolStripButtonMoveDown.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButtonMoveDown.Name = "toolStripButtonMoveDown";
+            this.toolStripButtonMoveDown.Size = new System.Drawing.Size(23, 22);
+            this.toolStripButtonMoveDown.Text = "Move Down";
+            this.toolStripButtonMoveDown.Click += new System.EventHandler(this.toolStripButtonMoveDown_Click);
+            // 
+            // LuaListView
+            // 
+            this.LuaListView.CheckBoxes = true;
+            this.LuaListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.Script,
             this.PathName});
-			this.LuaListView.ContextMenuStrip = this.contextMenuStrip1;
-			this.LuaListView.FullRowSelect = true;
-			this.LuaListView.GridLines = true;
-			this.LuaListView.HideSelection = false;
-			this.LuaListView.ItemCount = 0;
-			this.LuaListView.Location = new System.Drawing.Point(13, 71);
-			this.LuaListView.Name = "LuaListView";
-			this.LuaListView.selectedItem = -1;
-			this.LuaListView.Size = new System.Drawing.Size(291, 280);
-			this.LuaListView.TabIndex = 0;
-			this.LuaListView.UseCompatibleStateImageBehavior = false;
-			this.LuaListView.View = System.Windows.Forms.View.Details;
-			this.LuaListView.ItemActivate += new System.EventHandler(this.LuaListView_ItemActivate);
-			this.LuaListView.SelectedIndexChanged += new System.EventHandler(this.LuaListView_SelectedIndexChanged);
-			this.LuaListView.DoubleClick += new System.EventHandler(this.LuaListView_DoubleClick);
-			this.LuaListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.LuaListView_KeyDown);
-			// 
-			// Script
-			// 
-			this.Script.Text = "Script";
-			this.Script.Width = 92;
-			// 
-			// PathName
-			// 
-			this.PathName.Text = "Path";
-			this.PathName.Width = 195;
-			// 
-			// LuaConsole
-			// 
-			this.AllowDrop = true;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(584, 366);
-			this.Controls.Add(this.toolStrip1);
-			this.Controls.Add(this.groupBox1);
-			this.Controls.Add(this.NumberOfScripts);
-			this.Controls.Add(this.menuStrip1);
-			this.Controls.Add(this.LuaListView);
-			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-			this.MainMenuStrip = this.menuStrip1;
-			this.MinimumSize = new System.Drawing.Size(356, 132);
-			this.Name = "LuaConsole";
-			this.Text = "Lua Console";
-			this.Load += new System.EventHandler(this.LuaConsole_Load);
-			this.DragDrop += new System.Windows.Forms.DragEventHandler(this.LuaConsole_DragDrop);
-			this.DragEnter += new System.Windows.Forms.DragEventHandler(this.LuaConsole_DragEnter);
-			this.contextMenuStrip1.ResumeLayout(false);
-			this.menuStrip1.ResumeLayout(false);
-			this.menuStrip1.PerformLayout();
-			this.contextMenuStrip2.ResumeLayout(false);
-			this.groupBox1.ResumeLayout(false);
-			this.toolStrip1.ResumeLayout(false);
-			this.toolStrip1.PerformLayout();
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.LuaListView.ContextMenuStrip = this.contextMenuStrip1;
+            this.LuaListView.FullRowSelect = true;
+            this.LuaListView.GridLines = true;
+            this.LuaListView.HideSelection = false;
+            this.LuaListView.ItemCount = 0;
+            this.LuaListView.Location = new System.Drawing.Point(13, 71);
+            this.LuaListView.Name = "LuaListView";
+            this.LuaListView.selectedItem = -1;
+            this.LuaListView.Size = new System.Drawing.Size(291, 280);
+            this.LuaListView.TabIndex = 0;
+            this.LuaListView.UseCompatibleStateImageBehavior = false;
+            this.LuaListView.View = System.Windows.Forms.View.Details;
+            this.LuaListView.ItemActivate += new System.EventHandler(this.LuaListView_ItemActivate);
+            this.LuaListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.LuaListView_KeyDown);
+            // 
+            // Script
+            // 
+            this.Script.Text = "Script";
+            this.Script.Width = 92;
+            // 
+            // PathName
+            // 
+            this.PathName.Text = "Path";
+            this.PathName.Width = 195;
+            // 
+            // LuaConsole
+            // 
+            this.AllowDrop = true;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(584, 366);
+            this.Controls.Add(this.toolStrip1);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.NumberOfScripts);
+            this.Controls.Add(this.menuStrip1);
+            this.Controls.Add(this.LuaListView);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MainMenuStrip = this.menuStrip1;
+            this.MinimumSize = new System.Drawing.Size(356, 132);
+            this.Name = "LuaConsole";
+            this.Text = "Lua Console";
+            this.Load += new System.EventHandler(this.LuaConsole_Load);
+            this.DragDrop += new System.Windows.Forms.DragEventHandler(this.LuaConsole_DragDrop);
+            this.DragEnter += new System.Windows.Forms.DragEventHandler(this.LuaConsole_DragEnter);
+            this.contextMenuStrip1.ResumeLayout(false);
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
+            this.contextMenuStrip2.ResumeLayout(false);
+            this.groupBox1.ResumeLayout(false);
+            this.toolStrip1.ResumeLayout(false);
+            this.toolStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
diff --git a/BizHawk.MultiClient/tools/LuaConsole.cs b/BizHawk.MultiClient/tools/LuaConsole.cs
index f8ef38eb7a..eb4a13e000 100644
--- a/BizHawk.MultiClient/tools/LuaConsole.cs
+++ b/BizHawk.MultiClient/tools/LuaConsole.cs
@@ -97,6 +97,7 @@ namespace BizHawk.MultiClient
 			LuaImp.Close();
 			LuaImp = new LuaImplementation(this);
 			changes = true;
+            UpdateNumberOfScripts();
 		}
 
 		public void Restart()
@@ -162,18 +163,35 @@ namespace BizHawk.MultiClient
 
 		private void LoadLuaFile(string path)
 		{
-			bool enabled = true;
-			if (Global.Config.DisableLuaScriptsOnLoad)
-				enabled = false;
-			LuaFiles l = new LuaFiles("", path, enabled);
-			luaList.Add(l);
-			LuaListView.ItemCount = luaList.Count;
-			LuaListView.Refresh();
-			Global.Config.RecentLua.Add(path);
+            if (LuaAlreadyInSession(path) == false)
+            {
+                bool enabled = true;
+                if (Global.Config.DisableLuaScriptsOnLoad)
+                    enabled = false;
+                LuaFiles l = new LuaFiles("", path, enabled);
+                luaList.Add(l);
+                LuaListView.ItemCount = luaList.Count;
+                LuaListView.Refresh();
+                Global.Config.RecentLua.Add(path);
 
-			if (!Global.Config.DisableLuaScriptsOnLoad)
-				LuaImp.DoLuaFile(path);
-			changes = true;
+                if (!Global.Config.DisableLuaScriptsOnLoad)
+                    LuaImp.DoLuaFile(path);
+                changes = true;
+            }
+            else
+            {
+                for (int i = 0; i < luaList.Count; i++)
+                {
+                    if (path == luaList[i].Path && luaList[i].Enabled == false)
+                    {
+                        luaList[i].Toggle();
+                        LuaListView.Refresh();
+                        RunLuaScripts();
+                        changes = true;
+                        break;
+                    }
+                }
+            }
 		}
 
 		private void OpenLuaFile()
@@ -262,17 +280,6 @@ namespace BizHawk.MultiClient
 			NumberOfScripts.Text = message;
 		}
 
-		private void LuaListView_DoubleClick(object sender, EventArgs e)
-		{
-			MessageBox.Show("");
-			//Toggle();
-		}
-
-		private void LuaListView_SelectedIndexChanged(object sender, EventArgs e)
-		{
-
-		}
-
 		private void moveUpToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			MoveUp();
@@ -354,6 +361,7 @@ namespace BizHawk.MultiClient
 				indexes.Clear();
 				DisplayLuaList();
 			}
+            UpdateNumberOfScripts();
 		}
 
 		private void removeScriptToolStripMenuItem_Click(object sender, EventArgs e)
@@ -491,9 +499,24 @@ namespace BizHawk.MultiClient
 		private void LoadLuaFromRecent(string path)
 		{
 			LoadLuaFile(path);
+            UpdateNumberOfScripts();
 		}
 
-		private void LuaConsole_DragDrop(object sender, DragEventArgs e)
+        private bool LuaAlreadyInSession(string path)
+        {
+            bool Validated = false;
+            for (int i = 0; i < luaList.Count; i++)
+            {
+                if (path == luaList[i].Path)
+                {
+                    Validated = true;
+                    break;
+                }
+            }
+            return Validated;
+        }
+
+        private void LuaConsole_DragDrop(object sender, DragEventArgs e)
 		{
 			string[] filePaths = (string[])e.Data.GetData(DataFormats.FileDrop);
 			if (Path.GetExtension(filePaths[0]) == (".lua") || Path.GetExtension(filePaths[0]) == (".txt"))
@@ -591,6 +614,7 @@ namespace BizHawk.MultiClient
 
 		private void cutToolStripButton_Click(object sender, EventArgs e)
 		{
+            Toggle();
 			RemoveScript();
 		}
 
diff --git a/BizHawk.MultiClient/tools/LuaConsole.resx b/BizHawk.MultiClient/tools/LuaConsole.resx
index 501625a321..814a1793ef 100644
--- a/BizHawk.MultiClient/tools/LuaConsole.resx
+++ b/BizHawk.MultiClient/tools/LuaConsole.resx
@@ -133,17 +133,18 @@
   <data name="openToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVDhPlZNdSNNRGMb/F110ZZEVhVBgeeHNICiiuggp
-        olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdPKMgr7kApFItTUkWZqVhSVYmao5Nev/xyoQ4k88Nyc
-        8z6/93nP4QjCfy6lwc4ltZVso4P/tMyXRcmMHqZ0EeY6jZQVInzuf0e1Tb9Ina3P/tkpLD6XkNg8BJe5
-        u93C+HDVrP4M2ZkcMOOw5tLZ9nxJyJE4HSExBoKkBQhVpTrGhso9zNPfiph0JlB+U01ZcRbmwnRMeWlc
-        08opUCV6QissGsZ+WOY6z4hmuuXglC6pRYBbJSp+fzXNxnaZ66o1s3rkyKHWruJuWRYOcwZ2kxKr8TI3
-        DCkU6+QYNUnuNGWmLEY+5uOK3degoKZcx3SfEvozPfVB3OtNhi4ZvI2nrTIc23U9gtmYwa8eNXzScq8i
-        l6bHWnfRwhHeREJzGFONgYw/CeB9qQSZNNR9FyUGBT87lfQ3plJj1zLTq4COGDegLVo0HmeqKZjx+gOM
-        PNzDYPU2lLF+4jhyN6BIl8pgexK3bRpaXopJuhJEwGloiWDmVSgTLw4xWreXoZrtfK/wp/nKak4E+s6/
-        hDFHTkd9GndsOdCTBq1i3NdHmWgIYvRpAMO1OxlwSPhi2YpT641CuoWzsSfnAfnZiVRZ1Tjvx9GsF+bU
-        pF1BvWolD9JXUZmyDnOiD1cvbCZiYXfXCPrMi+gVZ8hOiiL53DHORwdzKnw/hw/uYt9uCTskfvj7+rBp
-        41rWr/Fig7fX8j/Tsn/fcgx/ARfG3ml6M3rzAAAAAElFTkSuQmCC
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I
+        k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC
+        TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p
+        AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0
+        BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr
+        UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG
+        CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5
+        F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS
+        rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt
+        NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp
+        59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W
+        AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">