diff --git a/src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs b/src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs
index 6aec80e3b2..eb2ef3a6b3 100644
--- a/src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs
@@ -30,7 +30,7 @@ namespace BizHawk.Client.EmuHawk
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.menuStrip1 = new MenuStripEx();
+			this.menuStrip1 = new BizHawk.WinForms.Controls.MenuStripEx();
 			this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.NewMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.OpenMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@@ -41,18 +41,18 @@ namespace BizHawk.Client.EmuHawk
 			this.noneToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.miAutoStart = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.miAutoSave = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.miAutoResume = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.toolStripSeparator2 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
 			this.ClearMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.DisassembleMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-			this.toolStrip1 = new ToolStripEx();
+			this.toolStrip1 = new BizHawk.WinForms.Controls.ToolStripEx();
 			this.tsbLoggingActive = new System.Windows.Forms.ToolStripButton();
 			this.toolStripSeparator3 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
 			this.tsbViewUpdate = new System.Windows.Forms.ToolStripButton();
 			this.tsbViewStyle = new System.Windows.Forms.ToolStripComboBox();
 			this.toolStripSeparator4 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
 			this.tsbExportText = new System.Windows.Forms.ToolStripButton();
-			this.lvCDL = new InputRoll();
-			this.miAutoResume = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.lvCDL = new BizHawk.Client.EmuHawk.InputRoll();
 			this.menuStrip1.SuspendLayout();
 			this.toolStrip1.SuspendLayout();
 			this.SuspendLayout();
@@ -132,6 +132,11 @@ namespace BizHawk.Client.EmuHawk
 			this.miAutoSave.Text = "Auto-Save";
 			this.miAutoSave.Click += new System.EventHandler(this.MiAutoSave_Click);
 			// 
+			// miAutoResume
+			// 
+			this.miAutoResume.Text = "Auto-Resume";
+			this.miAutoResume.Click += new System.EventHandler(this.MiAutoResume_Click);
+			// 
 			// ClearMenuItem
 			// 
 			this.ClearMenuItem.Text = "&Clear";
@@ -161,7 +166,7 @@ namespace BizHawk.Client.EmuHawk
 			this.tsbLoggingActive.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
 			this.tsbLoggingActive.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.tsbLoggingActive.Name = "tsbLoggingActive";
-			this.tsbLoggingActive.Size = new System.Drawing.Size(41, 22);
+			this.tsbLoggingActive.Size = new System.Drawing.Size(44, 22);
 			this.tsbLoggingActive.Text = "Active";
 			this.tsbLoggingActive.CheckedChanged += new System.EventHandler(this.TsbLoggingActive_CheckedChanged);
 			// 
@@ -173,7 +178,7 @@ namespace BizHawk.Client.EmuHawk
 			this.tsbViewUpdate.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
 			this.tsbViewUpdate.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.tsbViewUpdate.Name = "tsbViewUpdate";
-			this.tsbViewUpdate.Size = new System.Drawing.Size(46, 22);
+			this.tsbViewUpdate.Size = new System.Drawing.Size(49, 22);
 			this.tsbViewUpdate.Text = "Update";
 			// 
 			// tsbViewStyle
@@ -191,29 +196,30 @@ namespace BizHawk.Client.EmuHawk
 			// 
 			this.tsbExportText.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.tsbExportText.Name = "tsbExportText";
-			this.tsbExportText.Size = new System.Drawing.Size(87, 22);
+			this.tsbExportText.Size = new System.Drawing.Size(78, 22);
 			this.tsbExportText.Text = "To Clipboard";
 			this.tsbExportText.Click += new System.EventHandler(this.TsbExportText_Click);
 			// 
 			// lvCDL
 			// 
-			this.lvCDL.CellWidthPadding = 3;
-			this.lvCDL.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.lvCDL.FullRowSelect = true;
-			this.lvCDL.GridLines = true;
-			this.lvCDL.RowCount = 0;
-			this.lvCDL.Location = new System.Drawing.Point(0, 49);
-			this.lvCDL.Name = "lvCDL";
-			this.lvCDL.Size = new System.Drawing.Size(992, 323);
-			this.lvCDL.TabIndex = 9;
 			this.lvCDL.AllowColumnReorder = false;
 			this.lvCDL.AllowColumnResize = true;
-			this.lvCDL.QueryItemText += new InputRoll.QueryItemTextHandler(this.LvCDL_QueryItemText);
-			// 
-			// miAutoResume
-			// 
-			this.miAutoResume.Text = "Auto-Resume";
-			this.miAutoResume.Click += new System.EventHandler(this.MiAutoResume_Click);
+			this.lvCDL.AllowMassNavigationShortcuts = true;
+			this.lvCDL.AllowRightClickSelection = true;
+			this.lvCDL.AlwaysScroll = false;
+			this.lvCDL.CellHeightPadding = 0;
+			this.lvCDL.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.lvCDL.FullRowSelect = true;
+			this.lvCDL.HorizontalOrientation = false;
+			this.lvCDL.LetKeysModifySelection = false;
+			this.lvCDL.Location = new System.Drawing.Point(0, 49);
+			this.lvCDL.Name = "lvCDL";
+			this.lvCDL.RowCount = 0;
+			this.lvCDL.ScrollSpeed = 0;
+			this.lvCDL.SeekingCutoffInterval = 0;
+			this.lvCDL.Size = new System.Drawing.Size(992, 323);
+			this.lvCDL.TabIndex = 9;
+			this.lvCDL.QueryItemText += new BizHawk.Client.EmuHawk.InputRoll.QueryItemTextHandler(this.LvCDL_QueryItemText);
 			// 
 			// CDL
 			// 
diff --git a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs
index a3d533e3a1..8a37d682d0 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs
@@ -31,13 +31,13 @@ namespace BizHawk.Client.EmuHawk
 		private void InitializeComponent()
 		{
 			this.components = new System.ComponentModel.Container();
-			this.CheatListView = new InputRoll();
+			this.CheatListView = new BizHawk.Client.EmuHawk.InputRoll();
 			this.CheatsContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
 			this.ToggleContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.RemoveContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.DisableAllContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.ViewInHexEditorContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-			this.CheatsMenu = new MenuStripEx();
+			this.CheatsMenu = new BizHawk.WinForms.Controls.MenuStripEx();
 			this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.NewMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.OpenMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@@ -62,7 +62,7 @@ namespace BizHawk.Client.EmuHawk
 			this.AlwaysLoadCheatsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.AutoSaveCheatsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.DisableCheatsOnLoadMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-			this.toolStrip1 = new ToolStripEx();
+			this.toolStrip1 = new BizHawk.WinForms.Controls.ToolStripEx();
 			this.NewToolBarItem = new System.Windows.Forms.ToolStripButton();
 			this.OpenToolBarItem = new System.Windows.Forms.ToolStripButton();
 			this.SaveToolBarItem = new System.Windows.Forms.ToolStripButton();
@@ -86,20 +86,25 @@ namespace BizHawk.Client.EmuHawk
 			// 
 			// CheatListView
 			// 
-			this.CheatListView.CellWidthPadding = 3;
 			this.CheatListView.AllowColumnReorder = true;
 			this.CheatListView.AllowColumnResize = true;
-			this.CheatListView.MultiSelect = true;
 			this.CheatListView.AllowDrop = true;
+			this.CheatListView.AllowMassNavigationShortcuts = true;
+			this.CheatListView.AllowRightClickSelection = true;
+			this.CheatListView.AlwaysScroll = false;
 			this.CheatListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+			this.CheatListView.CellHeightPadding = 0;
 			this.CheatListView.ContextMenuStrip = this.CheatsContextMenu;
 			this.CheatListView.FullRowSelect = true;
-			this.CheatListView.GridLines = true;
-			this.CheatListView.RowCount = 0;
+			this.CheatListView.HorizontalOrientation = false;
+			this.CheatListView.LetKeysModifySelection = false;
 			this.CheatListView.Location = new System.Drawing.Point(12, 72);
 			this.CheatListView.Name = "CheatListView";
+			this.CheatListView.RowCount = 0;
+			this.CheatListView.ScrollSpeed = 0;
+			this.CheatListView.SeekingCutoffInterval = 0;
 			this.CheatListView.Size = new System.Drawing.Size(414, 321);
 			this.CheatListView.TabIndex = 1;
 			this.CheatListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.CheatListView_ColumnClick);
@@ -117,7 +122,7 @@ namespace BizHawk.Client.EmuHawk
             this.DisableAllContextMenuItem,
             this.ViewInHexEditorContextMenuItem});
 			this.CheatsContextMenu.Name = "contextMenuStrip1";
-			this.CheatsContextMenu.Size = new System.Drawing.Size(170, 92);
+			this.CheatsContextMenu.Size = new System.Drawing.Size(171, 92);
 			this.CheatsContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.CheatsContextMenu_Opening);
 			// 
 			// ToggleContextMenuItem
@@ -247,15 +252,15 @@ namespace BizHawk.Client.EmuHawk
 			// 
 			// ToggleMenuItem
 			// 
-			this.ToggleMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Enter)));
 			this.ToggleMenuItem.ShortcutKeyDisplayString = "Ctrl + Enter";
+			this.ToggleMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Return)));
 			this.ToggleMenuItem.Text = "&Toggle";
 			this.ToggleMenuItem.Click += new System.EventHandler(this.ToggleMenuItem_Click);
 			// 
 			// DisableAllCheatsMenuItem
 			// 
-			this.DisableAllCheatsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Back)));
 			this.DisableAllCheatsMenuItem.ShortcutKeyDisplayString = "Ctrl + Backspace";
+			this.DisableAllCheatsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Back)));
 			this.DisableAllCheatsMenuItem.Text = "Disable all";
 			this.DisableAllCheatsMenuItem.Click += new System.EventHandler(this.DisableAllCheatsMenuItem_Click);
 			// 
@@ -374,7 +379,7 @@ namespace BizHawk.Client.EmuHawk
 			this.LoadGameGenieToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
 			this.LoadGameGenieToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.LoadGameGenieToolbarItem.Name = "LoadGameGenieToolbarItem";
-			this.LoadGameGenieToolbarItem.Size = new System.Drawing.Size(75, 22);
+			this.LoadGameGenieToolbarItem.Size = new System.Drawing.Size(94, 22);
 			this.LoadGameGenieToolbarItem.Text = "Code Converter";
 			this.LoadGameGenieToolbarItem.ToolTipText = "Open the Cheat Code Converter";
 			this.LoadGameGenieToolbarItem.Click += new System.EventHandler(this.OpenGameGenieEncoderDecoderMenuItem_Click);
diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs
index 90d95e063c..72e93c48aa 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs
@@ -30,321 +30,320 @@ namespace BizHawk.Client.EmuHawk
 		/// </summary>
 		private void InitializeComponent()
 		{
-            this.components = new System.ComponentModel.Container();
-            this.menuStrip1 = new BizHawk.WinForms.Controls.MenuStripEx();
-            this.fileToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.DebugSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.StepIntoMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.StepOverMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.StepOutMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
-            this.RefreshMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.RegistersGroupBox = new System.Windows.Forms.GroupBox();
-            this.RegisterPanel = new BizHawk.Client.EmuHawk.RegisterBoxControl();
-            this.BreakpointsGroupBox = new System.Windows.Forms.GroupBox();
-            this.BreakPointControl1 = new BizHawk.Client.EmuHawk.BreakpointControl();
-            this.DisassemblerBox = new System.Windows.Forms.GroupBox();
-            this.ToPCBtn = new System.Windows.Forms.Button();
-            this.label1 = new BizHawk.WinForms.Controls.LocLabelEx();
-            this.DisassemblerView = new BizHawk.Client.EmuHawk.InputRoll();
-            this.DisassemblerContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.AddBreakpointContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.StepOutBtn = new System.Windows.Forms.Button();
-            this.StepIntoBtn = new System.Windows.Forms.Button();
-            this.StepOverBtn = new System.Windows.Forms.Button();
-            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.SeekToBtn = new System.Windows.Forms.Button();
-            this.SeekToBox = new BizHawk.Client.EmuHawk.HexTextBox();
-            this.CancelSeekBtn = new System.Windows.Forms.Button();
-            this.RunBtn = new System.Windows.Forms.Button();
-            this.menuStrip1.SuspendLayout();
-            this.RegistersGroupBox.SuspendLayout();
-            this.BreakpointsGroupBox.SuspendLayout();
-            this.DisassemblerBox.SuspendLayout();
-            this.DisassemblerContextMenu.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // menuStrip1
-            // 
-            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.components = new System.ComponentModel.Container();
+			this.menuStrip1 = new BizHawk.WinForms.Controls.MenuStripEx();
+			this.fileToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.DebugSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.StepIntoMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.StepOverMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.StepOutMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
+			this.RefreshMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.RegistersGroupBox = new System.Windows.Forms.GroupBox();
+			this.RegisterPanel = new BizHawk.Client.EmuHawk.RegisterBoxControl();
+			this.BreakpointsGroupBox = new System.Windows.Forms.GroupBox();
+			this.BreakPointControl1 = new BizHawk.Client.EmuHawk.BreakpointControl();
+			this.DisassemblerBox = new System.Windows.Forms.GroupBox();
+			this.ToPCBtn = new System.Windows.Forms.Button();
+			this.label1 = new BizHawk.WinForms.Controls.LocLabelEx();
+			this.DisassemblerView = new BizHawk.Client.EmuHawk.InputRoll();
+			this.DisassemblerContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.AddBreakpointContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.StepOutBtn = new System.Windows.Forms.Button();
+			this.StepIntoBtn = new System.Windows.Forms.Button();
+			this.StepOverBtn = new System.Windows.Forms.Button();
+			this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+			this.SeekToBtn = new System.Windows.Forms.Button();
+			this.SeekToBox = new BizHawk.Client.EmuHawk.HexTextBox();
+			this.CancelSeekBtn = new System.Windows.Forms.Button();
+			this.RunBtn = new System.Windows.Forms.Button();
+			this.menuStrip1.SuspendLayout();
+			this.RegistersGroupBox.SuspendLayout();
+			this.BreakpointsGroupBox.SuspendLayout();
+			this.DisassemblerBox.SuspendLayout();
+			this.DisassemblerContextMenu.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// menuStrip1
+			// 
+			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.fileToolStripMenuItem,
             this.DebugSubMenu});
-            this.menuStrip1.TabIndex = 1;
-            // 
-            // fileToolStripMenuItem
-            // 
-            this.fileToolStripMenuItem.Text = "&File";
-            // 
-            // DebugSubMenu
-            // 
-            this.DebugSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.menuStrip1.TabIndex = 1;
+			// 
+			// fileToolStripMenuItem
+			// 
+			this.fileToolStripMenuItem.Text = "&File";
+			// 
+			// DebugSubMenu
+			// 
+			this.DebugSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.StepIntoMenuItem,
             this.StepOverMenuItem,
             this.StepOutMenuItem,
             this.toolStripSeparator1,
             this.RefreshMenuItem});
-            this.DebugSubMenu.Text = "&Debug";
-            // 
-            // StepIntoMenuItem
-            // 
-            this.StepIntoMenuItem.Enabled = false;
-            this.StepIntoMenuItem.ShortcutKeyDisplayString = "F11";
-            this.StepIntoMenuItem.Text = "Step &Into";
-            this.StepIntoMenuItem.Click += new System.EventHandler(this.StepIntoMenuItem_Click);
-            // 
-            // StepOverMenuItem
-            // 
-            this.StepOverMenuItem.Enabled = false;
-            this.StepOverMenuItem.ShortcutKeyDisplayString = "F10";
-            this.StepOverMenuItem.Text = "Step O&ver";
-            this.StepOverMenuItem.Click += new System.EventHandler(this.StepOverMenuItem_Click);
-            // 
-            // StepOutMenuItem
-            // 
-            this.StepOutMenuItem.Enabled = false;
-            this.StepOutMenuItem.ShortcutKeyDisplayString = "Shift+F11";
-            this.StepOutMenuItem.Text = "Step Ou&t";
-            this.StepOutMenuItem.Click += new System.EventHandler(this.StepOutMenuItem_Click);
-            // 
-            // RefreshMenuItem
-            // 
-            this.RefreshMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5;
-            this.RefreshMenuItem.Text = "Refresh";
-            this.RefreshMenuItem.Click += new System.EventHandler(this.RefreshMenuItem_Click);
-            // 
-            // RegistersGroupBox
-            // 
-            this.RegistersGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+			this.DebugSubMenu.Text = "&Debug";
+			// 
+			// StepIntoMenuItem
+			// 
+			this.StepIntoMenuItem.Enabled = false;
+			this.StepIntoMenuItem.ShortcutKeyDisplayString = "F11";
+			this.StepIntoMenuItem.Text = "Step &Into";
+			this.StepIntoMenuItem.Click += new System.EventHandler(this.StepIntoMenuItem_Click);
+			// 
+			// StepOverMenuItem
+			// 
+			this.StepOverMenuItem.Enabled = false;
+			this.StepOverMenuItem.ShortcutKeyDisplayString = "F10";
+			this.StepOverMenuItem.Text = "Step O&ver";
+			this.StepOverMenuItem.Click += new System.EventHandler(this.StepOverMenuItem_Click);
+			// 
+			// StepOutMenuItem
+			// 
+			this.StepOutMenuItem.Enabled = false;
+			this.StepOutMenuItem.ShortcutKeyDisplayString = "Shift+F11";
+			this.StepOutMenuItem.Text = "Step Ou&t";
+			this.StepOutMenuItem.Click += new System.EventHandler(this.StepOutMenuItem_Click);
+			// 
+			// RefreshMenuItem
+			// 
+			this.RefreshMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5;
+			this.RefreshMenuItem.Text = "Refresh";
+			this.RefreshMenuItem.Click += new System.EventHandler(this.RefreshMenuItem_Click);
+			// 
+			// RegistersGroupBox
+			// 
+			this.RegistersGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.RegistersGroupBox.Controls.Add(this.RegisterPanel);
-            this.RegistersGroupBox.Location = new System.Drawing.Point(425, 27);
-            this.RegistersGroupBox.Name = "RegistersGroupBox";
-            this.RegistersGroupBox.Size = new System.Drawing.Size(330, 234);
-            this.RegistersGroupBox.TabIndex = 8;
-            this.RegistersGroupBox.TabStop = false;
-            this.RegistersGroupBox.Text = "Registers";
-            // 
-            // RegisterPanel
-            // 
-            this.RegisterPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.RegistersGroupBox.Controls.Add(this.RegisterPanel);
+			this.RegistersGroupBox.Location = new System.Drawing.Point(425, 27);
+			this.RegistersGroupBox.Name = "RegistersGroupBox";
+			this.RegistersGroupBox.Size = new System.Drawing.Size(330, 234);
+			this.RegistersGroupBox.TabIndex = 8;
+			this.RegistersGroupBox.TabStop = false;
+			this.RegistersGroupBox.Text = "Registers";
+			// 
+			// RegisterPanel
+			// 
+			this.RegisterPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.RegisterPanel.AutoScroll = true;
-            this.RegisterPanel.Core = null;
-            this.RegisterPanel.Font = new System.Drawing.Font("Courier New", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.RegisterPanel.Location = new System.Drawing.Point(8, 19);
-            this.RegisterPanel.Name = "RegisterPanel";
-            this.RegisterPanel.ParentDebugger = null;
-            this.RegisterPanel.Size = new System.Drawing.Size(316, 209);
-            this.RegisterPanel.TabIndex = 0;
-            // 
-            // BreakpointsGroupBox
-            // 
-            this.BreakpointsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.RegisterPanel.AutoScroll = true;
+			this.RegisterPanel.Core = null;
+			this.RegisterPanel.Font = new System.Drawing.Font("Courier New", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.RegisterPanel.Location = new System.Drawing.Point(8, 19);
+			this.RegisterPanel.Name = "RegisterPanel";
+			this.RegisterPanel.ParentDebugger = null;
+			this.RegisterPanel.Size = new System.Drawing.Size(316, 209);
+			this.RegisterPanel.TabIndex = 0;
+			// 
+			// BreakpointsGroupBox
+			// 
+			this.BreakpointsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.BreakpointsGroupBox.Controls.Add(this.BreakPointControl1);
-            this.BreakpointsGroupBox.Location = new System.Drawing.Point(425, 267);
-            this.BreakpointsGroupBox.Name = "BreakpointsGroupBox";
-            this.BreakpointsGroupBox.Size = new System.Drawing.Size(239, 281);
-            this.BreakpointsGroupBox.TabIndex = 9;
-            this.BreakpointsGroupBox.TabStop = false;
-            this.BreakpointsGroupBox.Text = "Breakpoints";
-            // 
-            // BreakPointControl1
-            // 
-            this.BreakPointControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.BreakpointsGroupBox.Controls.Add(this.BreakPointControl1);
+			this.BreakpointsGroupBox.Location = new System.Drawing.Point(425, 267);
+			this.BreakpointsGroupBox.Name = "BreakpointsGroupBox";
+			this.BreakpointsGroupBox.Size = new System.Drawing.Size(239, 281);
+			this.BreakpointsGroupBox.TabIndex = 9;
+			this.BreakpointsGroupBox.TabStop = false;
+			this.BreakpointsGroupBox.Text = "Breakpoints";
+			// 
+			// BreakPointControl1
+			// 
+			this.BreakPointControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.BreakPointControl1.Core = null;
-            this.BreakPointControl1.Location = new System.Drawing.Point(8, 19);
-            this.BreakPointControl1.MainForm = null;
-            this.BreakPointControl1.Mcs = null;
-            this.BreakPointControl1.MemoryDomains = null;
-            this.BreakPointControl1.Name = "BreakPointControl1";
-            this.BreakPointControl1.ParentDebugger = null;
-            this.BreakPointControl1.Size = new System.Drawing.Size(225, 256);
-            this.BreakPointControl1.TabIndex = 0;
-            // 
-            // DisassemblerBox
-            // 
-            this.DisassemblerBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.BreakPointControl1.Core = null;
+			this.BreakPointControl1.Location = new System.Drawing.Point(8, 19);
+			this.BreakPointControl1.MainForm = null;
+			this.BreakPointControl1.Mcs = null;
+			this.BreakPointControl1.MemoryDomains = null;
+			this.BreakPointControl1.Name = "BreakPointControl1";
+			this.BreakPointControl1.ParentDebugger = null;
+			this.BreakPointControl1.Size = new System.Drawing.Size(225, 256);
+			this.BreakPointControl1.TabIndex = 0;
+			// 
+			// DisassemblerBox
+			// 
+			this.DisassemblerBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
-            this.DisassemblerBox.Controls.Add(this.ToPCBtn);
-            this.DisassemblerBox.Controls.Add(this.label1);
-            this.DisassemblerBox.Controls.Add(this.DisassemblerView);
-            this.DisassemblerBox.Location = new System.Drawing.Point(12, 27);
-            this.DisassemblerBox.Name = "DisassemblerBox";
-            this.DisassemblerBox.Size = new System.Drawing.Size(407, 521);
-            this.DisassemblerBox.TabIndex = 7;
-            this.DisassemblerBox.TabStop = false;
-            this.DisassemblerBox.Text = "Disassembler";
-            // 
-            // ToPCBtn
-            // 
-            this.ToPCBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.ToPCBtn.Location = new System.Drawing.Point(351, 13);
-            this.ToPCBtn.Name = "ToPCBtn";
-            this.ToPCBtn.Size = new System.Drawing.Size(50, 23);
-            this.ToPCBtn.TabIndex = 3;
-            this.ToPCBtn.Text = "To PC";
-            this.ToPCBtn.UseVisualStyleBackColor = true;
-            this.ToPCBtn.Click += new System.EventHandler(this.ToPCBtn_Click);
-            // 
-            // label1
-            // 
-            this.label1.Location = new System.Drawing.Point(6, 51);
-            this.label1.Name = "label1";
-            this.label1.Text = "Cpu:  Use \'[\' or \']\' to change address, hold \'shift\' for speed.";
-            // 
-            // DisassemblerView
-            // 
-            this.DisassemblerView.AllowColumnReorder = false;
-            this.DisassemblerView.AllowColumnResize = true;
-            this.DisassemblerView.AllowMassNavigationShortcuts = true;
-            this.DisassemblerView.AllowRightClickSelection = true;
-            this.DisassemblerView.AlwaysScroll = false;
-            this.DisassemblerView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.DisassemblerBox.Controls.Add(this.ToPCBtn);
+			this.DisassemblerBox.Controls.Add(this.label1);
+			this.DisassemblerBox.Controls.Add(this.DisassemblerView);
+			this.DisassemblerBox.Location = new System.Drawing.Point(12, 27);
+			this.DisassemblerBox.Name = "DisassemblerBox";
+			this.DisassemblerBox.Size = new System.Drawing.Size(407, 521);
+			this.DisassemblerBox.TabIndex = 7;
+			this.DisassemblerBox.TabStop = false;
+			this.DisassemblerBox.Text = "Disassembler";
+			// 
+			// ToPCBtn
+			// 
+			this.ToPCBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.ToPCBtn.Location = new System.Drawing.Point(351, 13);
+			this.ToPCBtn.Name = "ToPCBtn";
+			this.ToPCBtn.Size = new System.Drawing.Size(50, 23);
+			this.ToPCBtn.TabIndex = 3;
+			this.ToPCBtn.Text = "To PC";
+			this.ToPCBtn.UseVisualStyleBackColor = true;
+			this.ToPCBtn.Click += new System.EventHandler(this.ToPCBtn_Click);
+			// 
+			// label1
+			// 
+			this.label1.Location = new System.Drawing.Point(6, 51);
+			this.label1.Name = "label1";
+			this.label1.Text = "Cpu:  Use \'[\' or \']\' to change address, hold \'shift\' for speed.";
+			// 
+			// DisassemblerView
+			// 
+			this.DisassemblerView.AllowColumnReorder = false;
+			this.DisassemblerView.AllowColumnResize = true;
+			this.DisassemblerView.AllowMassNavigationShortcuts = true;
+			this.DisassemblerView.AllowRightClickSelection = true;
+			this.DisassemblerView.AlwaysScroll = false;
+			this.DisassemblerView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.DisassemblerView.CellHeightPadding = 0;
-            this.DisassemblerView.ChangeSelectionWhenPaging = true;
-            this.DisassemblerView.ContextMenuStrip = this.DisassemblerContextMenu;
-            this.DisassemblerView.Font = new System.Drawing.Font("Courier New", 8F);
-            this.DisassemblerView.FullRowSelect = true;
-            this.DisassemblerView.HorizontalOrientation = false;
-            this.DisassemblerView.LetKeysModifySelection = false;
-            this.DisassemblerView.Location = new System.Drawing.Point(6, 67);
-            this.DisassemblerView.Name = "DisassemblerView";
-            this.DisassemblerView.RowCount = 0;
-            this.DisassemblerView.ScrollSpeed = 0;
-            this.DisassemblerView.SeekingCutoffInterval = 0;
-            this.DisassemblerView.Size = new System.Drawing.Size(395, 448);
-            this.DisassemblerView.TabIndex = 1;
-            this.DisassemblerView.SizeChanged += new System.EventHandler(this.DisassemblerView_SizeChanged);
-            this.DisassemblerView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DisassemblerView_KeyDown);
-            // 
-            // DisassemblerContextMenu
-            // 
-            this.DisassemblerContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.DisassemblerView.CellHeightPadding = 0;
+			this.DisassemblerView.ContextMenuStrip = this.DisassemblerContextMenu;
+			this.DisassemblerView.Font = new System.Drawing.Font("Courier New", 8F);
+			this.DisassemblerView.FullRowSelect = true;
+			this.DisassemblerView.HorizontalOrientation = false;
+			this.DisassemblerView.LetKeysModifySelection = false;
+			this.DisassemblerView.Location = new System.Drawing.Point(6, 67);
+			this.DisassemblerView.Name = "DisassemblerView";
+			this.DisassemblerView.RowCount = 0;
+			this.DisassemblerView.ScrollSpeed = 0;
+			this.DisassemblerView.SeekingCutoffInterval = 0;
+			this.DisassemblerView.Size = new System.Drawing.Size(395, 448);
+			this.DisassemblerView.TabIndex = 1;
+			this.DisassemblerView.SizeChanged += new System.EventHandler(this.DisassemblerView_SizeChanged);
+			this.DisassemblerView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DisassemblerView_KeyDown);
+			// 
+			// DisassemblerContextMenu
+			// 
+			this.DisassemblerContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.AddBreakpointContextMenuItem});
-            this.DisassemblerContextMenu.Name = "DisassemblerContextMenu";
-            this.DisassemblerContextMenu.Size = new System.Drawing.Size(157, 26);
-            this.DisassemblerContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.DisassemblerContextMenu_Opening);
-            // 
-            // AddBreakpointContextMenuItem
-            // 
-            this.AddBreakpointContextMenuItem.Text = "Add Breakpoint";
-            this.AddBreakpointContextMenuItem.Click += new System.EventHandler(this.AddBreakpointContextMenuItem_Click);
-            // 
-            // StepOutBtn
-            // 
-            this.StepOutBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.StepOutBtn.Enabled = false;
-            this.StepOutBtn.Location = new System.Drawing.Point(680, 519);
-            this.StepOutBtn.Name = "StepOutBtn";
-            this.StepOutBtn.Size = new System.Drawing.Size(75, 23);
-            this.StepOutBtn.TabIndex = 10;
-            this.StepOutBtn.Text = "Step Out";
-            this.StepOutBtn.UseVisualStyleBackColor = true;
-            this.StepOutBtn.Click += new System.EventHandler(this.StepOutMenuItem_Click);
-            // 
-            // StepIntoBtn
-            // 
-            this.StepIntoBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.StepIntoBtn.Enabled = false;
-            this.StepIntoBtn.Location = new System.Drawing.Point(680, 461);
-            this.StepIntoBtn.Name = "StepIntoBtn";
-            this.StepIntoBtn.Size = new System.Drawing.Size(75, 23);
-            this.StepIntoBtn.TabIndex = 11;
-            this.StepIntoBtn.Text = "Step Into";
-            this.StepIntoBtn.UseVisualStyleBackColor = true;
-            this.StepIntoBtn.Click += new System.EventHandler(this.StepIntoMenuItem_Click);
-            // 
-            // StepOverBtn
-            // 
-            this.StepOverBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.StepOverBtn.Enabled = false;
-            this.StepOverBtn.Location = new System.Drawing.Point(680, 490);
-            this.StepOverBtn.Name = "StepOverBtn";
-            this.StepOverBtn.Size = new System.Drawing.Size(75, 23);
-            this.StepOverBtn.TabIndex = 12;
-            this.StepOverBtn.Text = "Step Over";
-            this.StepOverBtn.UseVisualStyleBackColor = true;
-            this.StepOverBtn.Click += new System.EventHandler(this.StepOverMenuItem_Click);
-            // 
-            // SeekToBtn
-            // 
-            this.SeekToBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.SeekToBtn.Location = new System.Drawing.Point(680, 267);
-            this.SeekToBtn.Name = "SeekToBtn";
-            this.SeekToBtn.Size = new System.Drawing.Size(75, 23);
-            this.SeekToBtn.TabIndex = 13;
-            this.SeekToBtn.Text = "Seek To:";
-            this.SeekToBtn.UseVisualStyleBackColor = true;
-            this.SeekToBtn.Click += new System.EventHandler(this.SeekToBtn_Click);
-            // 
-            // SeekToBox
-            // 
-            this.SeekToBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.SeekToBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-            this.SeekToBox.Location = new System.Drawing.Point(680, 297);
-            this.SeekToBox.Name = "SeekToBox";
-            this.SeekToBox.Nullable = false;
-            this.SeekToBox.Size = new System.Drawing.Size(75, 20);
-            this.SeekToBox.TabIndex = 14;
-            // 
-            // CancelSeekBtn
-            // 
-            this.CancelSeekBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.CancelSeekBtn.Location = new System.Drawing.Point(680, 323);
-            this.CancelSeekBtn.Name = "CancelSeekBtn";
-            this.CancelSeekBtn.Size = new System.Drawing.Size(75, 23);
-            this.CancelSeekBtn.TabIndex = 15;
-            this.CancelSeekBtn.Text = "Cancel";
-            this.CancelSeekBtn.UseVisualStyleBackColor = true;
-            this.CancelSeekBtn.Click += new System.EventHandler(this.CancelSeekBtn_Click);
-            // 
-            // RunBtn
-            // 
-            this.RunBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.RunBtn.Location = new System.Drawing.Point(680, 432);
-            this.RunBtn.Name = "RunBtn";
-            this.RunBtn.Size = new System.Drawing.Size(75, 23);
-            this.RunBtn.TabIndex = 16;
-            this.RunBtn.Text = "Run";
-            this.RunBtn.UseVisualStyleBackColor = true;
-            this.RunBtn.Click += new System.EventHandler(this.RunBtn_Click);
-            // 
-            // GenericDebugger
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(767, 560);
-            this.Controls.Add(this.RunBtn);
-            this.Controls.Add(this.CancelSeekBtn);
-            this.Controls.Add(this.SeekToBox);
-            this.Controls.Add(this.SeekToBtn);
-            this.Controls.Add(this.StepOverBtn);
-            this.Controls.Add(this.StepIntoBtn);
-            this.Controls.Add(this.StepOutBtn);
-            this.Controls.Add(this.BreakpointsGroupBox);
-            this.Controls.Add(this.RegistersGroupBox);
-            this.Controls.Add(this.DisassemblerBox);
-            this.Controls.Add(this.menuStrip1);
-            this.MainMenuStrip = this.menuStrip1;
-            this.Name = "GenericDebugger";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.GenericDebugger_MouseMove);
-            this.menuStrip1.ResumeLayout(false);
-            this.menuStrip1.PerformLayout();
-            this.RegistersGroupBox.ResumeLayout(false);
-            this.BreakpointsGroupBox.ResumeLayout(false);
-            this.DisassemblerBox.ResumeLayout(false);
-            this.DisassemblerBox.PerformLayout();
-            this.DisassemblerContextMenu.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
+			this.DisassemblerContextMenu.Name = "DisassemblerContextMenu";
+			this.DisassemblerContextMenu.Size = new System.Drawing.Size(157, 26);
+			this.DisassemblerContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.DisassemblerContextMenu_Opening);
+			// 
+			// AddBreakpointContextMenuItem
+			// 
+			this.AddBreakpointContextMenuItem.Text = "Add Breakpoint";
+			this.AddBreakpointContextMenuItem.Click += new System.EventHandler(this.AddBreakpointContextMenuItem_Click);
+			// 
+			// StepOutBtn
+			// 
+			this.StepOutBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.StepOutBtn.Enabled = false;
+			this.StepOutBtn.Location = new System.Drawing.Point(680, 519);
+			this.StepOutBtn.Name = "StepOutBtn";
+			this.StepOutBtn.Size = new System.Drawing.Size(75, 23);
+			this.StepOutBtn.TabIndex = 10;
+			this.StepOutBtn.Text = "Step Out";
+			this.StepOutBtn.UseVisualStyleBackColor = true;
+			this.StepOutBtn.Click += new System.EventHandler(this.StepOutMenuItem_Click);
+			// 
+			// StepIntoBtn
+			// 
+			this.StepIntoBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.StepIntoBtn.Enabled = false;
+			this.StepIntoBtn.Location = new System.Drawing.Point(680, 461);
+			this.StepIntoBtn.Name = "StepIntoBtn";
+			this.StepIntoBtn.Size = new System.Drawing.Size(75, 23);
+			this.StepIntoBtn.TabIndex = 11;
+			this.StepIntoBtn.Text = "Step Into";
+			this.StepIntoBtn.UseVisualStyleBackColor = true;
+			this.StepIntoBtn.Click += new System.EventHandler(this.StepIntoMenuItem_Click);
+			// 
+			// StepOverBtn
+			// 
+			this.StepOverBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.StepOverBtn.Enabled = false;
+			this.StepOverBtn.Location = new System.Drawing.Point(680, 490);
+			this.StepOverBtn.Name = "StepOverBtn";
+			this.StepOverBtn.Size = new System.Drawing.Size(75, 23);
+			this.StepOverBtn.TabIndex = 12;
+			this.StepOverBtn.Text = "Step Over";
+			this.StepOverBtn.UseVisualStyleBackColor = true;
+			this.StepOverBtn.Click += new System.EventHandler(this.StepOverMenuItem_Click);
+			// 
+			// SeekToBtn
+			// 
+			this.SeekToBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.SeekToBtn.Location = new System.Drawing.Point(680, 267);
+			this.SeekToBtn.Name = "SeekToBtn";
+			this.SeekToBtn.Size = new System.Drawing.Size(75, 23);
+			this.SeekToBtn.TabIndex = 13;
+			this.SeekToBtn.Text = "Seek To:";
+			this.SeekToBtn.UseVisualStyleBackColor = true;
+			this.SeekToBtn.Click += new System.EventHandler(this.SeekToBtn_Click);
+			// 
+			// SeekToBox
+			// 
+			this.SeekToBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.SeekToBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+			this.SeekToBox.Location = new System.Drawing.Point(680, 297);
+			this.SeekToBox.Name = "SeekToBox";
+			this.SeekToBox.Nullable = false;
+			this.SeekToBox.Size = new System.Drawing.Size(75, 20);
+			this.SeekToBox.TabIndex = 14;
+			// 
+			// CancelSeekBtn
+			// 
+			this.CancelSeekBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.CancelSeekBtn.Location = new System.Drawing.Point(680, 323);
+			this.CancelSeekBtn.Name = "CancelSeekBtn";
+			this.CancelSeekBtn.Size = new System.Drawing.Size(75, 23);
+			this.CancelSeekBtn.TabIndex = 15;
+			this.CancelSeekBtn.Text = "Cancel";
+			this.CancelSeekBtn.UseVisualStyleBackColor = true;
+			this.CancelSeekBtn.Click += new System.EventHandler(this.CancelSeekBtn_Click);
+			// 
+			// RunBtn
+			// 
+			this.RunBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.RunBtn.Location = new System.Drawing.Point(680, 432);
+			this.RunBtn.Name = "RunBtn";
+			this.RunBtn.Size = new System.Drawing.Size(75, 23);
+			this.RunBtn.TabIndex = 16;
+			this.RunBtn.Text = "Run";
+			this.RunBtn.UseVisualStyleBackColor = true;
+			this.RunBtn.Click += new System.EventHandler(this.RunBtn_Click);
+			// 
+			// GenericDebugger
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(767, 560);
+			this.Controls.Add(this.RunBtn);
+			this.Controls.Add(this.CancelSeekBtn);
+			this.Controls.Add(this.SeekToBox);
+			this.Controls.Add(this.SeekToBtn);
+			this.Controls.Add(this.StepOverBtn);
+			this.Controls.Add(this.StepIntoBtn);
+			this.Controls.Add(this.StepOutBtn);
+			this.Controls.Add(this.BreakpointsGroupBox);
+			this.Controls.Add(this.RegistersGroupBox);
+			this.Controls.Add(this.DisassemblerBox);
+			this.Controls.Add(this.menuStrip1);
+			this.MainMenuStrip = this.menuStrip1;
+			this.Name = "GenericDebugger";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.GenericDebugger_MouseMove);
+			this.menuStrip1.ResumeLayout(false);
+			this.menuStrip1.PerformLayout();
+			this.RegistersGroupBox.ResumeLayout(false);
+			this.BreakpointsGroupBox.ResumeLayout(false);
+			this.DisassemblerBox.ResumeLayout(false);
+			this.DisassemblerBox.PerformLayout();
+			this.DisassemblerContextMenu.ResumeLayout(false);
+			this.ResumeLayout(false);
+			this.PerformLayout();
 
 		}
 
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs
index a00a8cd947..3e9c3ef9d9 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs
@@ -142,23 +142,18 @@
 			// 
 			this.BranchView.AllowColumnReorder = false;
 			this.BranchView.AllowColumnResize = false;
-			this.BranchView.AllowMassNavigationShortcuts = true;
-			this.BranchView.AllowRightClickSelection = true;
 			this.BranchView.AlwaysScroll = false;
 			this.BranchView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.BranchView.CellWidthPadding = 3;
 			this.BranchView.CellHeightPadding = 0;
 			this.BranchView.ChangeSelectionWhenPaging = false;
 			this.BranchView.ContextMenuStrip = this.BranchesContextMenu;
 			this.BranchView.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.BranchView.FullRowSelect = true;
-			this.BranchView.GridLines = true;
 			this.BranchView.HorizontalOrientation = false;
 			this.BranchView.LetKeysModifySelection = false;
 			this.BranchView.Location = new System.Drawing.Point(6, 19);
-			this.BranchView.MultiSelect = true;
 			this.BranchView.Name = "BranchView";
 			this.BranchView.RowCount = 0;
 			this.BranchView.ScrollSpeed = 1;
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.resx b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.resx
index 5af3536e76..b72db1b6d3 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.resx
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.resx
@@ -123,4 +123,7 @@
   <metadata name="BranchesContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>23, 17</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>185, 17</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs
index a141eecbd7..26ba57905e 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs
@@ -62,7 +62,7 @@
             this.toolStripSeparator1,
             this.RemoveMarkerToolStripMenuItem});
 			this.MarkerContextMenu.Name = "MarkerContextMenu";
-			this.MarkerContextMenu.Size = new System.Drawing.Size(119, 120);
+			this.MarkerContextMenu.Size = new System.Drawing.Size(196, 142);
 			this.MarkerContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.MarkerContextMenu_Opening);
 			// 
 			// JumpToMarkerToolStripMenuItem
@@ -181,14 +181,11 @@
 			// 
 			this.MarkerView.AllowColumnReorder = false;
 			this.MarkerView.AllowColumnResize = false;
-			this.MarkerView.AllowMassNavigationShortcuts = true;
-			this.MarkerView.AllowRightClickSelection = true;
 			this.MarkerView.AlwaysScroll = false;
 			this.MarkerView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.MarkerView.CellHeightPadding = 0;
-			this.MarkerView.ChangeSelectionWhenPaging = true;
 			this.MarkerView.ContextMenuStrip = this.MarkerContextMenu;
 			this.MarkerView.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.MarkerView.FullRowSelect = true;
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.resx b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.resx
index cabd6fd386..1e64cf2969 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.resx
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.resx
@@ -123,4 +123,7 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>168, 17</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>168, 17</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
index f3262bef95..8ea991774e 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
@@ -31,7 +31,7 @@ namespace BizHawk.Client.EmuHawk
 		private void InitializeComponent()
 		{
 			this.components = new System.ComponentModel.Container();
-			this.TASMenu = new MenuStripEx();
+			this.TASMenu = new BizHawk.WinForms.Controls.MenuStripEx();
 			this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.NewTASMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.NewFromSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@@ -83,6 +83,7 @@ namespace BizHawk.Client.EmuHawk
 			this.SetMaxUndoLevelsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.SetBranchCellHoverIntervalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.SetSeekingCutoffIntervalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.CopyIncludesFrameNoMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.toolStripSeparator26 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
 			this.autosaveToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.SetAutosaveIntervalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@@ -112,6 +113,7 @@ namespace BizHawk.Client.EmuHawk
 			this.customPatternToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.setpToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
 			this.setCustomsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.SetFontMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.MetaSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.HeaderMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.StateHistorySettingsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@@ -129,11 +131,11 @@ namespace BizHawk.Client.EmuHawk
 			this.toolStripSeparator12 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
 			this.hideWasLagFramesToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.iconsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-			this.ColorSettingsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.DenoteStatesWithIconsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.DenoteStatesWithBGColorToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.DenoteMarkersWithIconsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.DenoteMarkersWithBGColorToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.ColorSettingsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.toolStripSeparator23 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
 			this.followCursorToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.alwaysScrollToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@@ -153,7 +155,7 @@ namespace BizHawk.Client.EmuHawk
 			this.toolStripSeparator10 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
 			this.EnableTooltipsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.TasView = new BizHawk.Client.EmuHawk.InputRoll();
-			this.TasStatusStrip = new StatusStripEx();
+			this.TasStatusStrip = new BizHawk.WinForms.Controls.StatusStripEx();
 			this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
 			this.ProgressBar = new System.Windows.Forms.ToolStripProgressBar();
 			this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
@@ -191,8 +193,6 @@ namespace BizHawk.Client.EmuHawk
 			this.BookMarkControl = new BizHawk.Client.EmuHawk.BookmarksBranchesBox();
 			this.BranchesMarkersSplit = new System.Windows.Forms.SplitContainer();
 			this.MainVertialSplit = new System.Windows.Forms.SplitContainer();
-			this.SetFontMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-			this.CopyIncludesFrameNoMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.TASMenu.SuspendLayout();
 			this.TasStatusStrip.SuspendLayout();
 			this.RightClickMenu.SuspendLayout();
@@ -347,7 +347,7 @@ namespace BizHawk.Client.EmuHawk
             this.DeleteFramesMenuItem,
             this.CloneFramesMenuItem,
             this.CloneFramesXTimesMenuItem,
-			this.InsertNumFramesMenuItem,
+            this.InsertNumFramesMenuItem,
             this.toolStripSeparator6,
             this.TruncateMenuItem,
             this.ClearGreenzoneMenuItem,
@@ -503,7 +503,7 @@ namespace BizHawk.Client.EmuHawk
             this.AutopauseAtEndOfMovieMenuItem,
             this.sepToolStripMenuItem,
             this.autoHoldFireToolStripMenuItem,
-			this.SetFontMenuItem});
+            this.SetFontMenuItem});
 			this.ConfigSubMenu.Text = "&Config";
 			this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened);
 			// 
@@ -523,6 +523,11 @@ namespace BizHawk.Client.EmuHawk
 			this.SetSeekingCutoffIntervalMenuItem.Visible = false;
 			this.SetSeekingCutoffIntervalMenuItem.Click += new System.EventHandler(this.SetSeekingCutoffIntervalMenuItem_Click);
 			// 
+			// CopyIncludesFrameNoMenuItem
+			// 
+			this.CopyIncludesFrameNoMenuItem.Text = "Include Frame No. When Copying Row(s)";
+			this.CopyIncludesFrameNoMenuItem.Click += new System.EventHandler(this.CopyIncludesFrameNoMenuItem_Click);
+			// 
 			// autosaveToolStripMenuItem
 			// 
 			this.autosaveToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -659,6 +664,11 @@ namespace BizHawk.Client.EmuHawk
 			this.setCustomsToolStripMenuItem.Text = "Set Customs...";
 			this.setCustomsToolStripMenuItem.Click += new System.EventHandler(this.SetCustomsMenuItem_Click);
 			// 
+			// SetFontMenuItem
+			// 
+			this.SetFontMenuItem.Text = "Set Font";
+			this.SetFontMenuItem.Click += new System.EventHandler(this.SetFontMenuItem_Click);
+			// 
 			// MetaSubMenu
 			// 
 			this.MetaSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -771,11 +781,6 @@ namespace BizHawk.Client.EmuHawk
 			this.iconsToolStripMenuItem.Text = "Icons";
 			this.iconsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.IconsMenuItem_DropDownOpened);
 			// 
-			// ColorSettingsMenuItem
-			// 
-			this.ColorSettingsMenuItem.Text = "Edit TAStudio Colors...";
-			this.ColorSettingsMenuItem.Click += new System.EventHandler(this.ColorSettingsMenuItem_Click);
-			// 
 			// DenoteStatesWithIconsToolStripMenuItem
 			// 
 			this.DenoteStatesWithIconsToolStripMenuItem.CheckOnClick = true;
@@ -800,6 +805,11 @@ namespace BizHawk.Client.EmuHawk
 			this.DenoteMarkersWithBGColorToolStripMenuItem.Text = "Denote Markers With BG Color";
 			this.DenoteMarkersWithBGColorToolStripMenuItem.Click += new System.EventHandler(this.DenoteMarkersWithBGColorToolStripMenuItem_Click);
 			// 
+			// ColorSettingsMenuItem
+			// 
+			this.ColorSettingsMenuItem.Text = "Edit TAStudio Colors...";
+			this.ColorSettingsMenuItem.Click += new System.EventHandler(this.ColorSettingsMenuItem_Click);
+			// 
 			// followCursorToolStripMenuItem
 			// 
 			this.followCursorToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -886,28 +896,23 @@ namespace BizHawk.Client.EmuHawk
 			this.EnableTooltipsMenuItem.Text = "&Enable Tooltips";
 			// 
 			// TasView
-			//
-			this.TasView.ChangeSelectionWhenPaging = false;
-			this.TasView.InputPaintingMode = true;
-			this.TasView.CellWidthPadding = 3;
-			this.TasView.GridLines = true;
-			this.TasView.AllowMassNavigationShortcuts = false;
+			// 
 			this.TasView.AllowColumnReorder = false;
 			this.TasView.AllowColumnResize = false;
+			this.TasView.AllowMassNavigationShortcuts = false;
 			this.TasView.AllowRightClickSelection = false;
 			this.TasView.AlwaysScroll = false;
 			this.TasView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.TasView.CellHeightPadding = 0;
+			this.TasView.ChangeSelectionWhenPaging = false;
 			this.TasView.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.TasView.FullRowSelect = true;
-			this.TasView.HideWasLagFrames = false;
 			this.TasView.HorizontalOrientation = false;
-			this.TasView.LagFramesToHide = 0;
+			this.TasView.InputPaintingMode = true;
 			this.TasView.LetKeysModifySelection = true;
 			this.TasView.Location = new System.Drawing.Point(3, 0);
-			this.TasView.MultiSelect = true;
 			this.TasView.Name = "TasView";
 			this.TasView.Rotatable = true;
 			this.TasView.RowCount = 0;
@@ -942,7 +947,7 @@ namespace BizHawk.Client.EmuHawk
 			// MessageStatusLabel
 			// 
 			this.MessageStatusLabel.Name = "MessageStatusLabel";
-			this.MessageStatusLabel.Size = new System.Drawing.Size(95, 17);
+			this.MessageStatusLabel.Size = new System.Drawing.Size(103, 17);
 			this.MessageStatusLabel.Text = "TAStudio engaged";
 			// 
 			// ProgressBar
@@ -953,7 +958,7 @@ namespace BizHawk.Client.EmuHawk
 			// toolStripStatusLabel2
 			// 
 			this.toolStripStatusLabel2.Name = "toolStripStatusLabel2";
-			this.toolStripStatusLabel2.Size = new System.Drawing.Size(277, 17);
+			this.toolStripStatusLabel2.Size = new System.Drawing.Size(269, 17);
 			this.toolStripStatusLabel2.Spring = true;
 			// 
 			// SplicerStatusLabel
@@ -977,7 +982,7 @@ namespace BizHawk.Client.EmuHawk
 			this.MarkerControl.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.MarkerControl.Location = new System.Drawing.Point(0, 0);
 			this.MarkerControl.Name = "MarkerControl";
-			this.MarkerControl.Size = new System.Drawing.Size(200, 224);
+			this.MarkerControl.Size = new System.Drawing.Size(200, 225);
 			this.MarkerControl.TabIndex = 6;
 			this.MarkerControl.Tastudio = null;
 			// 
@@ -1004,7 +1009,7 @@ namespace BizHawk.Client.EmuHawk
             this.DeleteFramesContextMenuItem,
             this.CloneContextMenuItem,
             this.CloneXTimesContextMenuItem,
-			this.InsertNumFramesContextMenuItem,
+            this.InsertNumFramesContextMenuItem,
             this.toolStripSeparator18,
             this.TruncateContextMenuItem,
             this.BranchContextMenuItem,
@@ -1012,7 +1017,7 @@ namespace BizHawk.Client.EmuHawk
             this.StartNewProjectFromNowMenuItem,
             this.StartANewProjectFromSaveRamMenuItem});
 			this.RightClickMenu.Name = "RightClickMenu";
-			this.RightClickMenu.Size = new System.Drawing.Size(243, 480);
+			this.RightClickMenu.Size = new System.Drawing.Size(253, 502);
 			this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened);
 			// 
 			// SetMarkersContextMenuItem
@@ -1133,7 +1138,7 @@ namespace BizHawk.Client.EmuHawk
 			this.BookMarkControl.Name = "BookMarkControl";
 			this.BookMarkControl.RemovedCallback = null;
 			this.BookMarkControl.SavedCallback = null;
-			this.BookMarkControl.Size = new System.Drawing.Size(200, 184);
+			this.BookMarkControl.Size = new System.Drawing.Size(200, 183);
 			this.BookMarkControl.TabIndex = 8;
 			this.BookMarkControl.Tastudio = null;
 			// 
@@ -1154,7 +1159,7 @@ namespace BizHawk.Client.EmuHawk
 			// 
 			this.BranchesMarkersSplit.Panel2.Controls.Add(this.MarkerControl);
 			this.BranchesMarkersSplit.Size = new System.Drawing.Size(200, 412);
-			this.BranchesMarkersSplit.SplitterDistance = 184;
+			this.BranchesMarkersSplit.SplitterDistance = 183;
 			this.BranchesMarkersSplit.TabIndex = 9;
 			this.BranchesMarkersSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.BranchesMarkersSplit_SplitterMoved);
 			// 
@@ -1180,16 +1185,6 @@ namespace BizHawk.Client.EmuHawk
 			this.MainVertialSplit.TabIndex = 10;
 			this.MainVertialSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.MainVerticalSplit_SplitterMoved);
 			// 
-			// SetFontMenuItem
-			// 
-			this.SetFontMenuItem.Text = "Set Font";
-			this.SetFontMenuItem.Click += new System.EventHandler(this.SetFontMenuItem_Click);
-			// 
-			// CopyIncludesFrameNoMenuItem
-			// 
-			this.CopyIncludesFrameNoMenuItem.Text = "Include Frame No. When Copying Row(s)";
-			this.CopyIncludesFrameNoMenuItem.Click += new System.EventHandler(this.CopyIncludesFrameNoMenuItem_Click);
-			// 
 			// TAStudio
 			// 
 			this.AllowDrop = true;
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.Designer.cs
index ef20a8fdad..39a8adb9a1 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.Designer.cs
@@ -40,7 +40,7 @@
 			this.AutoScrollCheck = new System.Windows.Forms.CheckBox();
 			this.MaxStepsNum = new System.Windows.Forms.NumericUpDown();
 			this.label1 = new BizHawk.WinForms.Controls.LocLabelEx();
-			this.HistoryView = new InputRoll();
+			this.HistoryView = new BizHawk.Client.EmuHawk.InputRoll();
 			this.RightClickMenu.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.MaxStepsNum)).BeginInit();
 			this.SuspendLayout();
@@ -149,21 +149,28 @@
 			// 
 			// HistoryView
 			// 
+			this.HistoryView.AllowColumnReorder = false;
+			this.HistoryView.AllowColumnResize = false;
+			this.HistoryView.AlwaysScroll = false;
 			this.HistoryView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.HistoryView.RowCount = 0;
+			this.HistoryView.CellHeightPadding = 0;
+			this.HistoryView.CellWidthPadding = 0;
+			this.HistoryView.FullRowSelect = true;
+			this.HistoryView.HorizontalOrientation = false;
+			this.HistoryView.LetKeysModifySelection = false;
 			this.HistoryView.Location = new System.Drawing.Point(10, 10);
 			this.HistoryView.MultiSelect = false;
 			this.HistoryView.Name = "HistoryView";
+			this.HistoryView.RowCount = 0;
+			this.HistoryView.ScrollSpeed = 0;
+			this.HistoryView.SeekingCutoffInterval = 0;
 			this.HistoryView.Size = new System.Drawing.Size(369, 213);
 			this.HistoryView.TabIndex = 2;
 			this.HistoryView.DoubleClick += new System.EventHandler(this.HistoryView_DoubleClick);
 			this.HistoryView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.HistoryView_MouseDown);
 			this.HistoryView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.HistoryView_MouseUp);
-			this.HistoryView.AllowColumnReorder = false;
-			this.HistoryView.AllowColumnResize = false;
-			this.HistoryView.FullRowSelect = true;
 			// 
 			// UndoHistoryForm
 			// 
diff --git a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs
index d38cba1a8c..f8d3181d1f 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs
@@ -32,12 +32,12 @@ namespace BizHawk.Client.EmuHawk
 		{
 			this.components = new System.ComponentModel.Container();
 			this.TracerBox = new System.Windows.Forms.GroupBox();
-			this.TraceView = new InputRoll();
+			this.TraceView = new BizHawk.Client.EmuHawk.InputRoll();
 			this.TraceContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
 			this.CopyContextMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.SelectAllContextMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.ClearContextMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-			this.menuStrip1 = new MenuStripEx();
+			this.menuStrip1 = new BizHawk.WinForms.Controls.MenuStripEx();
 			this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.SaveLogMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.EditSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@@ -46,6 +46,7 @@ namespace BizHawk.Client.EmuHawk
 			this.ClearMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.OptionsSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.MaxLinesMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.SegmentSizeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.groupBox2 = new System.Windows.Forms.GroupBox();
 			this.OpenLogFile = new System.Windows.Forms.Button();
 			this.BrowseBox = new System.Windows.Forms.Button();
@@ -53,7 +54,6 @@ namespace BizHawk.Client.EmuHawk
 			this.ToFileRadio = new System.Windows.Forms.RadioButton();
 			this.ToWindowRadio = new System.Windows.Forms.RadioButton();
 			this.LoggingEnabled = new System.Windows.Forms.CheckBox();
-			this.SegmentSizeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.TracerBox.SuspendLayout();
 			this.TraceContextMenu.SuspendLayout();
 			this.menuStrip1.SuspendLayout();
@@ -75,21 +75,27 @@ namespace BizHawk.Client.EmuHawk
 			// 
 			// TraceView
 			// 
+			this.TraceView.AllowColumnReorder = false;
+			this.TraceView.AllowColumnResize = true;
+			this.TraceView.AlwaysScroll = false;
 			this.TraceView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+			this.TraceView.CellHeightPadding = 0;
+			this.TraceView.CellWidthPadding = 0;
 			this.TraceView.ContextMenuStrip = this.TraceContextMenu;
 			this.TraceView.Font = new System.Drawing.Font("Courier New", 8F);
 			this.TraceView.FullRowSelect = true;
-			this.TraceView.GridLines = true;
-			this.TraceView.RowCount = 0;
+			this.TraceView.HorizontalOrientation = false;
+			this.TraceView.LetKeysModifySelection = false;
 			this.TraceView.Location = new System.Drawing.Point(8, 18);
 			this.TraceView.Name = "TraceView";
+			this.TraceView.RowCount = 0;
+			this.TraceView.ScrollSpeed = 0;
+			this.TraceView.SeekingCutoffInterval = 0;
 			this.TraceView.Size = new System.Drawing.Size(603, 414);
 			this.TraceView.TabIndex = 4;
 			this.TraceView.TabStop = false;
-			this.TraceView.AllowColumnResize = true;
-			this.TraceView.AllowColumnReorder = false;
 			// 
 			// TraceContextMenu
 			// 
@@ -175,6 +181,11 @@ namespace BizHawk.Client.EmuHawk
 			this.MaxLinesMenuItem.Text = "&Set Max Lines...";
 			this.MaxLinesMenuItem.Click += new System.EventHandler(this.MaxLinesMenuItem_Click);
 			// 
+			// SegmentSizeMenuItem
+			// 
+			this.SegmentSizeMenuItem.Text = "Set Segment Size...";
+			this.SegmentSizeMenuItem.Click += new System.EventHandler(this.SegmentSizeMenuItem_Click);
+			// 
 			// groupBox2
 			// 
 			this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
@@ -262,11 +273,6 @@ namespace BizHawk.Client.EmuHawk
 			this.LoggingEnabled.UseVisualStyleBackColor = true;
 			this.LoggingEnabled.CheckedChanged += new System.EventHandler(this.LoggingEnabled_CheckedChanged);
 			// 
-			// SegmentSizeMenuItem
-			// 
-			this.SegmentSizeMenuItem.Text = "Set Segment Size...";
-			this.SegmentSizeMenuItem.Click += new System.EventHandler(this.SegmentSizeMenuItem_Click);
-			// 
 			// TraceLogger
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs
index 3eb467c51f..c3b22d4f26 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs
@@ -31,8 +31,9 @@ namespace BizHawk.Client.EmuHawk
 		private void InitializeComponent()
 		{
 			this.components = new System.ComponentModel.Container();
+			this.SearchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.TotalSearchLabel = new BizHawk.WinForms.Controls.LocLabelEx();
-			this.WatchListView = new InputRoll();
+			this.WatchListView = new BizHawk.Client.EmuHawk.InputRoll();
 			this.ListViewContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
 			this.DoSearchContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.NewSearchContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@@ -46,7 +47,7 @@ namespace BizHawk.Client.EmuHawk
 			this.ViewInHexEditorContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.ContextMenuSeparator3 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
 			this.ClearPreviewContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-			this.RamSearchMenu = new MenuStripEx();
+			this.RamSearchMenu = new BizHawk.WinForms.Controls.MenuStripEx();
 			this.fileToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.OpenMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.SaveMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@@ -87,6 +88,7 @@ namespace BizHawk.Client.EmuHawk
 			this.AddToRamWatchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.PokeAddressMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.FreezeAddressMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.SelectAllMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.toolStripSeparator13 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
 			this.ClearUndoMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.SettingsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@@ -110,7 +112,7 @@ namespace BizHawk.Client.EmuHawk
 			this.SpecificAddressRadio = new System.Windows.Forms.RadioButton();
 			this.SpecificValueRadio = new System.Windows.Forms.RadioButton();
 			this.PreviousValueRadio = new System.Windows.Forms.RadioButton();
-			this.toolStrip1 = new ToolStripEx();
+			this.toolStrip1 = new BizHawk.WinForms.Controls.ToolStripEx();
 			this.DoSearchToolButton = new System.Windows.Forms.ToolStripButton();
 			this.toolStripSeparator10 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
 			this.NewSearchToolButton = new System.Windows.Forms.ToolStripButton();
@@ -142,8 +144,6 @@ namespace BizHawk.Client.EmuHawk
 			this.label1 = new BizHawk.WinForms.Controls.LocLabelEx();
 			this.label2 = new BizHawk.WinForms.Controls.LocLabelEx();
 			this.DisplayTypeDropdown = new System.Windows.Forms.ComboBox();
-			this.SelectAllMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-			this.SearchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.ListViewContextMenu.SuspendLayout();
 			this.RamSearchMenu.SuspendLayout();
 			this.CompareToBox.SuspendLayout();
@@ -164,22 +164,26 @@ namespace BizHawk.Client.EmuHawk
 			// 
 			// WatchListView
 			// 
-			this.WatchListView.CellWidthPadding = 3;
 			this.WatchListView.AllowColumnReorder = true;
 			this.WatchListView.AllowColumnResize = true;
 			this.WatchListView.AllowDrop = true;
+			this.WatchListView.AlwaysScroll = false;
 			this.WatchListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+			this.WatchListView.CellHeightPadding = 0;
+			this.WatchListView.CellWidthPadding = 0;
 			this.WatchListView.ContextMenuStrip = this.ListViewContextMenu;
 			this.WatchListView.FullRowSelect = true;
-			this.WatchListView.GridLines = true;
-			this.WatchListView.RowCount = 0;
+			this.WatchListView.HorizontalOrientation = false;
+			this.WatchListView.LetKeysModifySelection = false;
 			this.WatchListView.Location = new System.Drawing.Point(9, 65);
 			this.WatchListView.Name = "WatchListView";
+			this.WatchListView.RowCount = 0;
+			this.WatchListView.ScrollSpeed = 0;
+			this.WatchListView.SeekingCutoffInterval = 0;
 			this.WatchListView.Size = new System.Drawing.Size(230, 366);
 			this.WatchListView.TabIndex = 1;
-			this.WatchListView.MultiSelect = true;
 			this.WatchListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.WatchListView_ColumnClick);
 			this.WatchListView.SelectedIndexChanged += new System.EventHandler(this.WatchListView_SelectedIndexChanged);
 			this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamSearch_DragDrop);
@@ -313,7 +317,7 @@ namespace BizHawk.Client.EmuHawk
 			this.RecentSubMenu.Text = "Recent";
 			this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened);
 			// 
-			// settingsToolStripMenuItem
+			// OptionsSubMenuMenuItem
 			// 
 			this.OptionsSubMenuMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.modeToolStripMenuItem,
@@ -422,7 +426,7 @@ namespace BizHawk.Client.EmuHawk
 			this.searchToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.newSearchToolStripMenuItem,
             this.toolStripSeparator7,
-            SearchMenuItem,
+            this.SearchMenuItem,
             this.UndoMenuItem,
             this.RedoMenuItem,
             this.CopyValueToPrevMenuItem,
@@ -497,12 +501,19 @@ namespace BizHawk.Client.EmuHawk
 			this.FreezeAddressMenuItem.Text = "Freeze Address";
 			this.FreezeAddressMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click);
 			// 
+			// SelectAllMenuItem
+			// 
+			this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A";
+			this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
+			this.SelectAllMenuItem.Text = "Select All";
+			this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click);
+			// 
 			// ClearUndoMenuItem
 			// 
 			this.ClearUndoMenuItem.Text = "Clear Undo History";
 			this.ClearUndoMenuItem.Click += new System.EventHandler(this.ClearUndoMenuItem_Click);
 			// 
-			// optionsToolStripMenuItem
+			// SettingsMenuItem
 			// 
 			this.SettingsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.PreviewModeMenuItem,
@@ -539,13 +550,6 @@ namespace BizHawk.Client.EmuHawk
 			this.UseUndoHistoryMenuItem.Text = "&Use Undo History";
 			this.UseUndoHistoryMenuItem.Click += new System.EventHandler(this.UseUndoHistoryMenuItem_Click);
 			// 
-			// SelectAllMenuItem
-			// 
-			this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
-			this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A";
-			this.SelectAllMenuItem.Text = "Select All";
-			this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click);
-			// 
 			// MemDomainLabel
 			// 
 			this.MemDomainLabel.Location = new System.Drawing.Point(135, 49);
@@ -564,9 +568,9 @@ namespace BizHawk.Client.EmuHawk
 			this.AutoSearchCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
 			this.AutoSearchCheckBox.Appearance = System.Windows.Forms.Appearance.Button;
 			this.AutoSearchCheckBox.AutoSize = true;
-			this.AutoSearchCheckBox.Location = new System.Drawing.Point(316, 410);
+			this.AutoSearchCheckBox.Location = new System.Drawing.Point(348, 410);
 			this.AutoSearchCheckBox.Name = "AutoSearchCheckBox";
-			this.AutoSearchCheckBox.Size = new System.Drawing.Size(38, 22);
+			this.AutoSearchCheckBox.Size = new System.Drawing.Size(6, 6);
 			this.AutoSearchCheckBox.TabIndex = 105;
 			this.AutoSearchCheckBox.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
 			this.toolTip1.SetToolTip(this.AutoSearchCheckBox, "Automatically search each frame");
@@ -600,11 +604,12 @@ namespace BizHawk.Client.EmuHawk
 			this.DifferenceBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
 			this.DifferenceBox.Enabled = false;
 			this.DifferenceBox.Location = new System.Drawing.Point(114, 98);
-			this.DifferenceBox.MaxLength = 8;
+			this.DifferenceBox.MaxLength = 2;
 			this.DifferenceBox.Name = "DifferenceBox";
 			this.DifferenceBox.Nullable = false;
 			this.DifferenceBox.Size = new System.Drawing.Size(72, 20);
 			this.DifferenceBox.TabIndex = 45;
+			this.DifferenceBox.Text = "00";
 			this.DifferenceBox.Type = BizHawk.Client.Common.WatchDisplayType.Hex;
 			this.DifferenceBox.TextChanged += new System.EventHandler(this.CompareToValue_TextChanged);
 			// 
@@ -739,7 +744,7 @@ namespace BizHawk.Client.EmuHawk
 			this.DoSearchToolButton.Enabled = false;
 			this.DoSearchToolButton.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.DoSearchToolButton.Name = "DoSearchToolButton";
-			this.DoSearchToolButton.Size = new System.Drawing.Size(65, 22);
+			this.DoSearchToolButton.Size = new System.Drawing.Size(49, 22);
 			this.DoSearchToolButton.Text = "Search ";
 			this.DoSearchToolButton.Click += new System.EventHandler(this.SearchMenuItem_Click);
 			// 
@@ -747,7 +752,7 @@ namespace BizHawk.Client.EmuHawk
 			// 
 			this.NewSearchToolButton.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.NewSearchToolButton.Name = "NewSearchToolButton";
-			this.NewSearchToolButton.Size = new System.Drawing.Size(51, 22);
+			this.NewSearchToolButton.Size = new System.Drawing.Size(35, 22);
 			this.NewSearchToolButton.Text = "New";
 			this.NewSearchToolButton.Click += new System.EventHandler(this.NewSearchMenuMenuItem_Click);
 			// 
@@ -875,11 +880,12 @@ namespace BizHawk.Client.EmuHawk
 			this.DifferentByBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
 			this.DifferentByBox.Enabled = false;
 			this.DifferentByBox.Location = new System.Drawing.Point(88, 132);
-			this.DifferentByBox.MaxLength = 9;
+			this.DifferentByBox.MaxLength = 2;
 			this.DifferentByBox.Name = "DifferentByBox";
 			this.DifferentByBox.Nullable = false;
 			this.DifferentByBox.Size = new System.Drawing.Size(55, 20);
 			this.DifferentByBox.TabIndex = 85;
+			this.DifferentByBox.Text = "00";
 			this.DifferentByBox.Type = BizHawk.Client.Common.WatchDisplayType.Hex;
 			this.DifferentByBox.TextChanged += new System.EventHandler(this.DifferentByBox_TextChanged);
 			// 
@@ -1064,7 +1070,6 @@ namespace BizHawk.Client.EmuHawk
 		#endregion
 
 		private BizHawk.WinForms.Controls.LocLabelEx TotalSearchLabel;
-		private BizHawk.WinForms.Controls.ToolStripMenuItemEx SearchMenuItem;
 		private InputRoll WatchListView;
 		private BizHawk.WinForms.Controls.ToolStripMenuItemEx fileToolStripMenuItem;
 		private BizHawk.WinForms.Controls.ToolStripMenuItemEx OpenMenuItem;
@@ -1176,5 +1181,6 @@ namespace BizHawk.Client.EmuHawk
 		private BizHawk.WinForms.Controls.ToolStripMenuItemEx Previous_LastChangeMenuItem;
 		private BizHawk.WinForms.Controls.ToolStripMenuItemEx AutoSearchAccountForLagMenuItem;
 		private ToolStripMenuItemEx SelectAllMenuItem;
+		private ToolStripMenuItemEx SearchMenuItem;
 	}
 }
diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.resx b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.resx
index db23b6f695..6eaa06301e 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.resx
+++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="SearchMenuItem.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <metadata name="ListViewContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>161, 17</value>
   </metadata>
diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs
index 53f3881377..fa416b3c98 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs
@@ -30,101 +30,101 @@ namespace BizHawk.Client.EmuHawk
 		/// </summary>
 		private void InitializeComponent()
 		{
-            this.components = new System.ComponentModel.Container();
-            this.WatchCountLabel = new BizHawk.WinForms.Controls.LocLabelEx();
-            this.ListViewContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.newToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.EditContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.RemoveContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.DuplicateContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.SplitContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.PokeContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.FreezeContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.UnfreezeAllContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.ViewInHexEditorContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.Separator4 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
-            this.ReadBreakpointContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.WriteBreakpointContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.Separator6 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
-            this.InsertSeperatorContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.MoveUpContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.MoveDownContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.MoveTopContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.MoveBottomContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.statusStrip1 = new StatusStripEx();
-            this.ErrorIconButton = new System.Windows.Forms.ToolStripButton();
-            this.MessageLabel = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStrip1 = new ToolStripEx();
-            this.newToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.openToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.saveToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.toolStripSeparator = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
-            this.newWatchToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.editWatchToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.cutToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.clearChangeCountsToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.duplicateWatchToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.SplitWatchToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.PokeAddressToolBarItem = new System.Windows.Forms.ToolStripButton();
-            this.FreezeAddressToolBarItem = new System.Windows.Forms.ToolStripButton();
-            this.seperatorToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.toolStripSeparator6 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
-            this.moveUpToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.moveDownToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.toolStripSeparator5 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
-            this.RamWatchMenu = new MenuStripEx();
-            this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.NewListMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.OpenMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.SaveMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.SaveAsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.AppendMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.RecentSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.noneToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.WatchesSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.MemoryDomainsSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.Separator2 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
-            this.toolStripSeparator8 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
-            this.NewWatchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.EditWatchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.RemoveWatchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.DuplicateWatchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.SplitWatchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.PokeAddressMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.FreezeAddressMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.InsertSeparatorMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.ClearChangeCountsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.toolStripSeparator3 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
-            this.MoveUpMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.MoveDownMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.MoveTopMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.MoveBottomMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.SelectAllMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.components = new System.ComponentModel.Container();
+			this.WatchCountLabel = new BizHawk.WinForms.Controls.LocLabelEx();
+			this.ListViewContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.newToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.EditContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.RemoveContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.DuplicateContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.SplitContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.PokeContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.FreezeContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.UnfreezeAllContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.ViewInHexEditorContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.Separator4 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
+			this.ReadBreakpointContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.WriteBreakpointContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.Separator6 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
+			this.InsertSeperatorContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.MoveUpContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.MoveDownContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.MoveTopContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.MoveBottomContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.statusStrip1 = new BizHawk.WinForms.Controls.StatusStripEx();
+			this.ErrorIconButton = new System.Windows.Forms.ToolStripButton();
+			this.MessageLabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.toolStrip1 = new BizHawk.WinForms.Controls.ToolStripEx();
+			this.newToolStripButton = new System.Windows.Forms.ToolStripButton();
+			this.openToolStripButton = new System.Windows.Forms.ToolStripButton();
+			this.saveToolStripButton = new System.Windows.Forms.ToolStripButton();
+			this.toolStripSeparator = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
+			this.newWatchToolStripButton = new System.Windows.Forms.ToolStripButton();
+			this.editWatchToolStripButton = new System.Windows.Forms.ToolStripButton();
+			this.cutToolStripButton = new System.Windows.Forms.ToolStripButton();
+			this.clearChangeCountsToolStripButton = new System.Windows.Forms.ToolStripButton();
+			this.duplicateWatchToolStripButton = new System.Windows.Forms.ToolStripButton();
+			this.SplitWatchToolStripButton = new System.Windows.Forms.ToolStripButton();
+			this.PokeAddressToolBarItem = new System.Windows.Forms.ToolStripButton();
+			this.FreezeAddressToolBarItem = new System.Windows.Forms.ToolStripButton();
+			this.seperatorToolStripButton = new System.Windows.Forms.ToolStripButton();
+			this.toolStripSeparator6 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
+			this.moveUpToolStripButton = new System.Windows.Forms.ToolStripButton();
+			this.moveDownToolStripButton = new System.Windows.Forms.ToolStripButton();
+			this.toolStripSeparator5 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
+			this.RamWatchMenu = new BizHawk.WinForms.Controls.MenuStripEx();
+			this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.NewListMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.OpenMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.SaveMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.SaveAsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.AppendMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.RecentSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.noneToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.WatchesSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.MemoryDomainsSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.Separator2 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
+			this.toolStripSeparator8 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
+			this.NewWatchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.EditWatchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.RemoveWatchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.DuplicateWatchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.SplitWatchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.PokeAddressMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.FreezeAddressMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.InsertSeparatorMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.ClearChangeCountsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.toolStripSeparator3 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
+			this.MoveUpMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.MoveDownMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.MoveTopMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.MoveBottomMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.SelectAllMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
 			this.OptionsSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.DefinePreviousValueSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.PreviousFrameMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.LastChangeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.OriginalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.WatchesOnScreenMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-			this.WatchListView = new InputRoll();
-            this.DoubleClickActionSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.DoubleClickToEditMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.DoubleClickToPokeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
-            this.ListViewContextMenu.SuspendLayout();
-            this.statusStrip1.SuspendLayout();
-            this.toolStrip1.SuspendLayout();
-            this.RamWatchMenu.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // WatchCountLabel
-            // 
-            this.WatchCountLabel.Location = new System.Drawing.Point(16, 57);
-            this.WatchCountLabel.Name = "WatchCountLabel";
-            this.WatchCountLabel.Text = "0 watches";
-            // 
-            // ListViewContextMenu
-            // 
-            this.ListViewContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.DefinePreviousValueSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.PreviousFrameMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.LastChangeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.OriginalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.WatchesOnScreenMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.DoubleClickActionSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.DoubleClickToEditMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.DoubleClickToPokeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
+			this.WatchListView = new BizHawk.Client.EmuHawk.InputRoll();
+			this.ListViewContextMenu.SuspendLayout();
+			this.statusStrip1.SuspendLayout();
+			this.toolStrip1.SuspendLayout();
+			this.RamWatchMenu.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// WatchCountLabel
+			// 
+			this.WatchCountLabel.Location = new System.Drawing.Point(16, 57);
+			this.WatchCountLabel.Name = "WatchCountLabel";
+			this.WatchCountLabel.Text = "0 watches";
+			// 
+			// ListViewContextMenu
+			// 
+			this.ListViewContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.newToolStripMenuItem,
             this.EditContextMenuItem,
             this.RemoveContextMenuItem,
@@ -143,131 +143,131 @@ namespace BizHawk.Client.EmuHawk
             this.MoveDownContextMenuItem,
             this.MoveTopContextMenuItem,
             this.MoveBottomContextMenuItem});
-            this.ListViewContextMenu.Name = "contextMenuStrip1";
-            this.ListViewContextMenu.Size = new System.Drawing.Size(245, 346);
-            this.ListViewContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ListViewContextMenu_Opening);
-            // 
-            // newToolStripMenuItem
-            // 
-            this.newToolStripMenuItem.Text = "&New Watch";
-            this.newToolStripMenuItem.Click += new System.EventHandler(this.NewWatchMenuItem_Click);
-            // 
-            // EditContextMenuItem
-            // 
-            this.EditContextMenuItem.ShortcutKeyDisplayString = "Ctrl+E";
-            this.EditContextMenuItem.Text = "&Edit";
-            this.EditContextMenuItem.Click += new System.EventHandler(this.EditWatchMenuItem_Click);
-            // 
-            // RemoveContextMenuItem
-            // 
-            this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Ctrl+R";
-            this.RemoveContextMenuItem.Text = "&Remove";
-            this.RemoveContextMenuItem.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click);
-            // 
-            // DuplicateContextMenuItem
-            // 
-            this.DuplicateContextMenuItem.ShortcutKeyDisplayString = "Ctrl+D";
-            this.DuplicateContextMenuItem.Text = "&Duplicate";
-            this.DuplicateContextMenuItem.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click);
-            // 
-            // SplitContextMenuItem
-            // 
-            this.SplitContextMenuItem.ShortcutKeyDisplayString = "Ctrl+L";
-            this.SplitContextMenuItem.Text = "Sp&lit";
-            this.SplitContextMenuItem.Click += new System.EventHandler(this.SplitWatchMenuItem_Click);
-            // 
-            // PokeContextMenuItem
-            // 
-            this.PokeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+P";
-            this.PokeContextMenuItem.Text = "&Poke";
-            this.PokeContextMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click);
-            // 
-            // FreezeContextMenuItem
-            // 
-            this.FreezeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+F";
-            this.FreezeContextMenuItem.Text = "&Freeze";
-            this.FreezeContextMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click);
-            // 
-            // UnfreezeAllContextMenuItem
-            // 
-            this.UnfreezeAllContextMenuItem.Text = "Unfreeze &All";
-            this.UnfreezeAllContextMenuItem.Click += new System.EventHandler(this.UnfreezeAllContextMenuItem_Click);
-            // 
-            // ViewInHexEditorContextMenuItem
-            // 
-            this.ViewInHexEditorContextMenuItem.Text = "View in Hex Editor";
-            this.ViewInHexEditorContextMenuItem.Click += new System.EventHandler(this.ViewInHexEditorContextMenuItem_Click);
-            // 
-            // ReadBreakpointContextMenuItem
-            // 
-            this.ReadBreakpointContextMenuItem.Text = "Set Read Breakpoint";
-            this.ReadBreakpointContextMenuItem.Click += new System.EventHandler(this.ReadBreakpointContextMenuItem_Click);
-            // 
-            // WriteBreakpointContextMenuItem
-            // 
-            this.WriteBreakpointContextMenuItem.Text = "Set Write Breakpoint";
-            this.WriteBreakpointContextMenuItem.Click += new System.EventHandler(this.WriteBreakpointContextMenuItem_Click);
-            // 
-            // InsertSeperatorContextMenuItem
-            // 
-            this.InsertSeperatorContextMenuItem.ShortcutKeyDisplayString = "Ctrl+I";
-            this.InsertSeperatorContextMenuItem.Text = "&Insert Separator";
-            this.InsertSeperatorContextMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click);
-            // 
-            // MoveUpContextMenuItem
-            // 
-            this.MoveUpContextMenuItem.ShortcutKeyDisplayString = "Ctrl+Up";
-            this.MoveUpContextMenuItem.Text = "Move &Up";
-            this.MoveUpContextMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click);
-            // 
-            // MoveDownContextMenuItem
-            // 
-            this.MoveDownContextMenuItem.ShortcutKeyDisplayString = "Ctrl+Down";
-            this.MoveDownContextMenuItem.Text = "Move &Down";
-            this.MoveDownContextMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click);
-            // 
-            // MoveTopContextMenuItem
-            // 
-            this.MoveTopContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
+			this.ListViewContextMenu.Name = "contextMenuStrip1";
+			this.ListViewContextMenu.Size = new System.Drawing.Size(245, 368);
+			this.ListViewContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ListViewContextMenu_Opening);
+			// 
+			// newToolStripMenuItem
+			// 
+			this.newToolStripMenuItem.Text = "&New Watch";
+			this.newToolStripMenuItem.Click += new System.EventHandler(this.NewWatchMenuItem_Click);
+			// 
+			// EditContextMenuItem
+			// 
+			this.EditContextMenuItem.ShortcutKeyDisplayString = "Ctrl+E";
+			this.EditContextMenuItem.Text = "&Edit";
+			this.EditContextMenuItem.Click += new System.EventHandler(this.EditWatchMenuItem_Click);
+			// 
+			// RemoveContextMenuItem
+			// 
+			this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Ctrl+R";
+			this.RemoveContextMenuItem.Text = "&Remove";
+			this.RemoveContextMenuItem.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click);
+			// 
+			// DuplicateContextMenuItem
+			// 
+			this.DuplicateContextMenuItem.ShortcutKeyDisplayString = "Ctrl+D";
+			this.DuplicateContextMenuItem.Text = "&Duplicate";
+			this.DuplicateContextMenuItem.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click);
+			// 
+			// SplitContextMenuItem
+			// 
+			this.SplitContextMenuItem.ShortcutKeyDisplayString = "Ctrl+L";
+			this.SplitContextMenuItem.Text = "Sp&lit";
+			this.SplitContextMenuItem.Click += new System.EventHandler(this.SplitWatchMenuItem_Click);
+			// 
+			// PokeContextMenuItem
+			// 
+			this.PokeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+P";
+			this.PokeContextMenuItem.Text = "&Poke";
+			this.PokeContextMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click);
+			// 
+			// FreezeContextMenuItem
+			// 
+			this.FreezeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+F";
+			this.FreezeContextMenuItem.Text = "&Freeze";
+			this.FreezeContextMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click);
+			// 
+			// UnfreezeAllContextMenuItem
+			// 
+			this.UnfreezeAllContextMenuItem.Text = "Unfreeze &All";
+			this.UnfreezeAllContextMenuItem.Click += new System.EventHandler(this.UnfreezeAllContextMenuItem_Click);
+			// 
+			// ViewInHexEditorContextMenuItem
+			// 
+			this.ViewInHexEditorContextMenuItem.Text = "View in Hex Editor";
+			this.ViewInHexEditorContextMenuItem.Click += new System.EventHandler(this.ViewInHexEditorContextMenuItem_Click);
+			// 
+			// ReadBreakpointContextMenuItem
+			// 
+			this.ReadBreakpointContextMenuItem.Text = "Set Read Breakpoint";
+			this.ReadBreakpointContextMenuItem.Click += new System.EventHandler(this.ReadBreakpointContextMenuItem_Click);
+			// 
+			// WriteBreakpointContextMenuItem
+			// 
+			this.WriteBreakpointContextMenuItem.Text = "Set Write Breakpoint";
+			this.WriteBreakpointContextMenuItem.Click += new System.EventHandler(this.WriteBreakpointContextMenuItem_Click);
+			// 
+			// InsertSeperatorContextMenuItem
+			// 
+			this.InsertSeperatorContextMenuItem.ShortcutKeyDisplayString = "Ctrl+I";
+			this.InsertSeperatorContextMenuItem.Text = "&Insert Separator";
+			this.InsertSeperatorContextMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click);
+			// 
+			// MoveUpContextMenuItem
+			// 
+			this.MoveUpContextMenuItem.ShortcutKeyDisplayString = "Ctrl+Up";
+			this.MoveUpContextMenuItem.Text = "Move &Up";
+			this.MoveUpContextMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click);
+			// 
+			// MoveDownContextMenuItem
+			// 
+			this.MoveDownContextMenuItem.ShortcutKeyDisplayString = "Ctrl+Down";
+			this.MoveDownContextMenuItem.Text = "Move &Down";
+			this.MoveDownContextMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click);
+			// 
+			// MoveTopContextMenuItem
+			// 
+			this.MoveTopContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
             | System.Windows.Forms.Keys.Up)));
-            this.MoveTopContextMenuItem.Text = "Move &Top";
-            this.MoveTopContextMenuItem.Click += new System.EventHandler(this.MoveTopMenuItem_Click);
-            // 
-            // MoveBottomContextMenuItem
-            // 
-            this.MoveBottomContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
+			this.MoveTopContextMenuItem.Text = "Move &Top";
+			this.MoveTopContextMenuItem.Click += new System.EventHandler(this.MoveTopMenuItem_Click);
+			// 
+			// MoveBottomContextMenuItem
+			// 
+			this.MoveBottomContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
             | System.Windows.Forms.Keys.Down)));
-            this.MoveBottomContextMenuItem.Text = "Move &Bottom";
-            this.MoveBottomContextMenuItem.Click += new System.EventHandler(this.MoveBottomMenuItem_Click);
-            // 
-            // statusStrip1
-            // 
-            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.MoveBottomContextMenuItem.Text = "Move &Bottom";
+			this.MoveBottomContextMenuItem.Click += new System.EventHandler(this.MoveBottomMenuItem_Click);
+			// 
+			// statusStrip1
+			// 
+			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ErrorIconButton,
             this.MessageLabel});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 356);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.TabIndex = 8;
-            // 
-            // ErrorIconButton
-            // 
-            this.ErrorIconButton.BackColor = System.Drawing.Color.NavajoWhite;
-            this.ErrorIconButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.ErrorIconButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.ErrorIconButton.Name = "ErrorIconButton";
-            this.ErrorIconButton.Size = new System.Drawing.Size(23, 20);
-            this.ErrorIconButton.Text = "Warning! Out of Range Addresses in list, click to remove them";
-            this.ErrorIconButton.Click += new System.EventHandler(this.ErrorIconButton_Click);
-            // 
-            // MessageLabel
-            // 
-            this.MessageLabel.Name = "MessageLabel";
-            this.MessageLabel.Size = new System.Drawing.Size(31, 17);
-            this.MessageLabel.Text = "        ";
-            // 
-            // toolStrip1
-            // 
-            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.statusStrip1.Location = new System.Drawing.Point(0, 356);
+			this.statusStrip1.Name = "statusStrip1";
+			this.statusStrip1.TabIndex = 8;
+			// 
+			// ErrorIconButton
+			// 
+			this.ErrorIconButton.BackColor = System.Drawing.Color.NavajoWhite;
+			this.ErrorIconButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.ErrorIconButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.ErrorIconButton.Name = "ErrorIconButton";
+			this.ErrorIconButton.Size = new System.Drawing.Size(23, 20);
+			this.ErrorIconButton.Text = "Warning! Out of Range Addresses in list, click to remove them";
+			this.ErrorIconButton.Click += new System.EventHandler(this.ErrorIconButton_Click);
+			// 
+			// MessageLabel
+			// 
+			this.MessageLabel.Name = "MessageLabel";
+			this.MessageLabel.Size = new System.Drawing.Size(31, 17);
+			this.MessageLabel.Text = "        ";
+			// 
+			// toolStrip1
+			// 
+			this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.newToolStripButton,
             this.openToolStripButton,
             this.saveToolStripButton,
@@ -285,206 +285,206 @@ namespace BizHawk.Client.EmuHawk
             this.moveUpToolStripButton,
             this.moveDownToolStripButton,
             this.toolStripSeparator5});
-            this.toolStrip1.Location = new System.Drawing.Point(0, 24);
-            this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.TabIndex = 4;
-            this.toolStrip1.TabStop = true;
-            // 
-            // newToolStripButton
-            // 
-            this.newToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.newToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.newToolStripButton.Name = "newToolStripButton";
-            this.newToolStripButton.Size = new System.Drawing.Size(23, 22);
-            this.newToolStripButton.Text = "&New";
-            this.newToolStripButton.Click += new System.EventHandler(this.NewListMenuItem_Click);
-            // 
-            // openToolStripButton
-            // 
-            this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.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";
-            this.openToolStripButton.Click += new System.EventHandler(this.OpenMenuItem_Click);
-            // 
-            // saveToolStripButton
-            // 
-            this.saveToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.saveToolStripButton.Name = "saveToolStripButton";
-            this.saveToolStripButton.Size = new System.Drawing.Size(23, 22);
-            this.saveToolStripButton.Text = "&Save";
-            this.saveToolStripButton.Click += new System.EventHandler(this.SaveMenuItem_Click);
-            // 
-            // newWatchToolStripButton
-            // 
-            this.newWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.newWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.newWatchToolStripButton.Name = "newWatchToolStripButton";
-            this.newWatchToolStripButton.Size = new System.Drawing.Size(23, 22);
-            this.newWatchToolStripButton.Text = "New Watch";
-            this.newWatchToolStripButton.ToolTipText = "New Watch";
-            this.newWatchToolStripButton.Click += new System.EventHandler(this.NewWatchMenuItem_Click);
-            // 
-            // editWatchToolStripButton
-            // 
-            this.editWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.editWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.editWatchToolStripButton.Name = "editWatchToolStripButton";
-            this.editWatchToolStripButton.Size = new System.Drawing.Size(23, 22);
-            this.editWatchToolStripButton.Text = "Edit Watch";
-            this.editWatchToolStripButton.Click += new System.EventHandler(this.EditWatchMenuItem_Click);
-            // 
-            // cutToolStripButton
-            // 
-            this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.cutToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.cutToolStripButton.Name = "cutToolStripButton";
-            this.cutToolStripButton.Size = new System.Drawing.Size(23, 22);
-            this.cutToolStripButton.Text = "C&ut";
-            this.cutToolStripButton.ToolTipText = "Remove Watch";
-            this.cutToolStripButton.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click);
-            // 
-            // clearChangeCountsToolStripButton
-            // 
-            this.clearChangeCountsToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.clearChangeCountsToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.clearChangeCountsToolStripButton.Name = "clearChangeCountsToolStripButton";
-            this.clearChangeCountsToolStripButton.Size = new System.Drawing.Size(23, 22);
-            this.clearChangeCountsToolStripButton.Text = "C";
-            this.clearChangeCountsToolStripButton.ToolTipText = "Clear Change Counts";
-            this.clearChangeCountsToolStripButton.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click);
-            // 
-            // duplicateWatchToolStripButton
-            // 
-            this.duplicateWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.duplicateWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.duplicateWatchToolStripButton.Name = "duplicateWatchToolStripButton";
-            this.duplicateWatchToolStripButton.Size = new System.Drawing.Size(23, 22);
-            this.duplicateWatchToolStripButton.Text = "Duplicate Watch";
-            this.duplicateWatchToolStripButton.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click);
-            // 
-            // SplitWatchToolStripButton
-            // 
-            this.SplitWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.SplitWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.SplitWatchToolStripButton.Name = "SplitWatchToolStripButton";
-            this.SplitWatchToolStripButton.Size = new System.Drawing.Size(23, 22);
-            this.SplitWatchToolStripButton.Text = "Split Watch";
-            this.SplitWatchToolStripButton.Click += new System.EventHandler(this.SplitWatchMenuItem_Click);
-            // 
-            // PokeAddressToolBarItem
-            // 
-            this.PokeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.PokeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.PokeAddressToolBarItem.Name = "PokeAddressToolBarItem";
-            this.PokeAddressToolBarItem.Size = new System.Drawing.Size(23, 22);
-            this.PokeAddressToolBarItem.Text = "toolStripButton2";
-            this.PokeAddressToolBarItem.ToolTipText = "Poke address";
-            this.PokeAddressToolBarItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click);
-            // 
-            // FreezeAddressToolBarItem
-            // 
-            this.FreezeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.FreezeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.FreezeAddressToolBarItem.Name = "FreezeAddressToolBarItem";
-            this.FreezeAddressToolBarItem.Size = new System.Drawing.Size(23, 22);
-            this.FreezeAddressToolBarItem.Text = "Freeze Address";
-            this.FreezeAddressToolBarItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click);
-            // 
-            // seperatorToolStripButton
-            // 
-            this.seperatorToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.seperatorToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.seperatorToolStripButton.Name = "seperatorToolStripButton";
-            this.seperatorToolStripButton.Size = new System.Drawing.Size(23, 22);
-            this.seperatorToolStripButton.Text = "-";
-            this.seperatorToolStripButton.ToolTipText = "Insert Separator";
-            this.seperatorToolStripButton.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click);
-            // 
-            // moveUpToolStripButton
-            // 
-            this.moveUpToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.moveUpToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.moveUpToolStripButton.Name = "moveUpToolStripButton";
-            this.moveUpToolStripButton.Size = new System.Drawing.Size(23, 22);
-            this.moveUpToolStripButton.Text = "Move Up";
-            this.moveUpToolStripButton.Click += new System.EventHandler(this.MoveUpMenuItem_Click);
-            // 
-            // moveDownToolStripButton
-            // 
-            this.moveDownToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.moveDownToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.moveDownToolStripButton.Name = "moveDownToolStripButton";
-            this.moveDownToolStripButton.Size = new System.Drawing.Size(23, 22);
-            this.moveDownToolStripButton.Text = "Move Down";
-            this.moveDownToolStripButton.Click += new System.EventHandler(this.MoveDownMenuItem_Click);
+			this.toolStrip1.Location = new System.Drawing.Point(0, 24);
+			this.toolStrip1.Name = "toolStrip1";
+			this.toolStrip1.TabIndex = 4;
+			this.toolStrip1.TabStop = true;
 			// 
-            // RamWatchMenu
-            // 
-            this.RamWatchMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			// newToolStripButton
+			// 
+			this.newToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.newToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.newToolStripButton.Name = "newToolStripButton";
+			this.newToolStripButton.Size = new System.Drawing.Size(23, 22);
+			this.newToolStripButton.Text = "&New";
+			this.newToolStripButton.Click += new System.EventHandler(this.NewListMenuItem_Click);
+			// 
+			// openToolStripButton
+			// 
+			this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.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";
+			this.openToolStripButton.Click += new System.EventHandler(this.OpenMenuItem_Click);
+			// 
+			// saveToolStripButton
+			// 
+			this.saveToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.saveToolStripButton.Name = "saveToolStripButton";
+			this.saveToolStripButton.Size = new System.Drawing.Size(23, 22);
+			this.saveToolStripButton.Text = "&Save";
+			this.saveToolStripButton.Click += new System.EventHandler(this.SaveMenuItem_Click);
+			// 
+			// newWatchToolStripButton
+			// 
+			this.newWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.newWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.newWatchToolStripButton.Name = "newWatchToolStripButton";
+			this.newWatchToolStripButton.Size = new System.Drawing.Size(23, 22);
+			this.newWatchToolStripButton.Text = "New Watch";
+			this.newWatchToolStripButton.ToolTipText = "New Watch";
+			this.newWatchToolStripButton.Click += new System.EventHandler(this.NewWatchMenuItem_Click);
+			// 
+			// editWatchToolStripButton
+			// 
+			this.editWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.editWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.editWatchToolStripButton.Name = "editWatchToolStripButton";
+			this.editWatchToolStripButton.Size = new System.Drawing.Size(23, 22);
+			this.editWatchToolStripButton.Text = "Edit Watch";
+			this.editWatchToolStripButton.Click += new System.EventHandler(this.EditWatchMenuItem_Click);
+			// 
+			// cutToolStripButton
+			// 
+			this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.cutToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.cutToolStripButton.Name = "cutToolStripButton";
+			this.cutToolStripButton.Size = new System.Drawing.Size(23, 22);
+			this.cutToolStripButton.Text = "C&ut";
+			this.cutToolStripButton.ToolTipText = "Remove Watch";
+			this.cutToolStripButton.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click);
+			// 
+			// clearChangeCountsToolStripButton
+			// 
+			this.clearChangeCountsToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+			this.clearChangeCountsToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.clearChangeCountsToolStripButton.Name = "clearChangeCountsToolStripButton";
+			this.clearChangeCountsToolStripButton.Size = new System.Drawing.Size(23, 22);
+			this.clearChangeCountsToolStripButton.Text = "C";
+			this.clearChangeCountsToolStripButton.ToolTipText = "Clear Change Counts";
+			this.clearChangeCountsToolStripButton.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click);
+			// 
+			// duplicateWatchToolStripButton
+			// 
+			this.duplicateWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.duplicateWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.duplicateWatchToolStripButton.Name = "duplicateWatchToolStripButton";
+			this.duplicateWatchToolStripButton.Size = new System.Drawing.Size(23, 22);
+			this.duplicateWatchToolStripButton.Text = "Duplicate Watch";
+			this.duplicateWatchToolStripButton.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click);
+			// 
+			// SplitWatchToolStripButton
+			// 
+			this.SplitWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.SplitWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.SplitWatchToolStripButton.Name = "SplitWatchToolStripButton";
+			this.SplitWatchToolStripButton.Size = new System.Drawing.Size(23, 22);
+			this.SplitWatchToolStripButton.Text = "Split Watch";
+			this.SplitWatchToolStripButton.Click += new System.EventHandler(this.SplitWatchMenuItem_Click);
+			// 
+			// PokeAddressToolBarItem
+			// 
+			this.PokeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.PokeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.PokeAddressToolBarItem.Name = "PokeAddressToolBarItem";
+			this.PokeAddressToolBarItem.Size = new System.Drawing.Size(23, 22);
+			this.PokeAddressToolBarItem.Text = "toolStripButton2";
+			this.PokeAddressToolBarItem.ToolTipText = "Poke address";
+			this.PokeAddressToolBarItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click);
+			// 
+			// FreezeAddressToolBarItem
+			// 
+			this.FreezeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.FreezeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.FreezeAddressToolBarItem.Name = "FreezeAddressToolBarItem";
+			this.FreezeAddressToolBarItem.Size = new System.Drawing.Size(23, 22);
+			this.FreezeAddressToolBarItem.Text = "Freeze Address";
+			this.FreezeAddressToolBarItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click);
+			// 
+			// seperatorToolStripButton
+			// 
+			this.seperatorToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.seperatorToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.seperatorToolStripButton.Name = "seperatorToolStripButton";
+			this.seperatorToolStripButton.Size = new System.Drawing.Size(23, 22);
+			this.seperatorToolStripButton.Text = "-";
+			this.seperatorToolStripButton.ToolTipText = "Insert Separator";
+			this.seperatorToolStripButton.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click);
+			// 
+			// moveUpToolStripButton
+			// 
+			this.moveUpToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.moveUpToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.moveUpToolStripButton.Name = "moveUpToolStripButton";
+			this.moveUpToolStripButton.Size = new System.Drawing.Size(23, 22);
+			this.moveUpToolStripButton.Text = "Move Up";
+			this.moveUpToolStripButton.Click += new System.EventHandler(this.MoveUpMenuItem_Click);
+			// 
+			// moveDownToolStripButton
+			// 
+			this.moveDownToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.moveDownToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.moveDownToolStripButton.Name = "moveDownToolStripButton";
+			this.moveDownToolStripButton.Size = new System.Drawing.Size(23, 22);
+			this.moveDownToolStripButton.Text = "Move Down";
+			this.moveDownToolStripButton.Click += new System.EventHandler(this.MoveDownMenuItem_Click);
+			// 
+			// RamWatchMenu
+			// 
+			this.RamWatchMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.FileSubMenu,
             this.WatchesSubMenu,
             this.OptionsSubMenu});
-            this.RamWatchMenu.TabIndex = 3;
-            // 
-            // FileSubMenu
-            // 
-            this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.RamWatchMenu.TabIndex = 3;
+			// 
+			// FileSubMenu
+			// 
+			this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.NewListMenuItem,
             this.OpenMenuItem,
             this.SaveMenuItem,
             this.SaveAsMenuItem,
             this.AppendMenuItem,
             this.RecentSubMenu});
-            this.FileSubMenu.Text = "&Files";
-            this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened);
-            // 
-            // NewListMenuItem
-            // 
-            this.NewListMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
-            this.NewListMenuItem.Text = "&New List";
-            this.NewListMenuItem.Click += new System.EventHandler(this.NewListMenuItem_Click);
-            // 
-            // OpenMenuItem
-            // 
-            this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
-            this.OpenMenuItem.Text = "&Open...";
-            this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click);
-            // 
-            // SaveMenuItem
-            // 
-            this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
-            this.SaveMenuItem.Text = "&Save";
-            this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click);
-            // 
-            // SaveAsMenuItem
-            // 
-            this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
-            | System.Windows.Forms.Keys.S)));
-            this.SaveAsMenuItem.Text = "Save &As...";
-            this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click);
-            // 
-            // AppendMenuItem
-            // 
-            this.AppendMenuItem.Text = "A&ppend File...";
-            this.AppendMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click);
-            // 
-            // RecentSubMenu
-            // 
-            this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.noneToolStripMenuItem});
-            this.RecentSubMenu.Text = "Recent";
-            this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened);
-            // 
-            // noneToolStripMenuItem
-            // 
-            this.noneToolStripMenuItem.Text = "None";
+			this.FileSubMenu.Text = "&Files";
+			this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened);
 			// 
-            // WatchesSubMenu
-            // 
-            this.WatchesSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			// NewListMenuItem
+			// 
+			this.NewListMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
+			this.NewListMenuItem.Text = "&New List";
+			this.NewListMenuItem.Click += new System.EventHandler(this.NewListMenuItem_Click);
+			// 
+			// OpenMenuItem
+			// 
+			this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
+			this.OpenMenuItem.Text = "&Open...";
+			this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click);
+			// 
+			// SaveMenuItem
+			// 
+			this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
+			this.SaveMenuItem.Text = "&Save";
+			this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click);
+			// 
+			// SaveAsMenuItem
+			// 
+			this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
+            | System.Windows.Forms.Keys.S)));
+			this.SaveAsMenuItem.Text = "Save &As...";
+			this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click);
+			// 
+			// AppendMenuItem
+			// 
+			this.AppendMenuItem.Text = "A&ppend File...";
+			this.AppendMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click);
+			// 
+			// RecentSubMenu
+			// 
+			this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.noneToolStripMenuItem});
+			this.RecentSubMenu.Text = "Recent";
+			this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened);
+			// 
+			// noneToolStripMenuItem
+			// 
+			this.noneToolStripMenuItem.Text = "None";
+			// 
+			// WatchesSubMenu
+			// 
+			this.WatchesSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.MemoryDomainsSubMenu,
             this.toolStripSeparator8,
             this.NewWatchMenuItem,
@@ -502,210 +502,213 @@ namespace BizHawk.Client.EmuHawk
             this.MoveTopMenuItem,
             this.MoveBottomMenuItem,
             this.SelectAllMenuItem});
-            this.WatchesSubMenu.Text = "&Watches";
-            this.WatchesSubMenu.DropDownOpened += new System.EventHandler(this.WatchesSubMenu_DropDownOpened);
-            // 
-            // MemoryDomainsSubMenu
-            // 
-            this.MemoryDomainsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.Separator2});
-            this.MemoryDomainsSubMenu.Text = "Default Domain";
-            this.MemoryDomainsSubMenu.DropDownOpened += new System.EventHandler(this.MemoryDomainsSubMenu_DropDownOpened);
-            // 
-            // NewWatchMenuItem
-            // 
-            this.NewWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
-            this.NewWatchMenuItem.Text = "&New Watch";
-            this.NewWatchMenuItem.Click += new System.EventHandler(this.NewWatchMenuItem_Click);
-            // 
-            // EditWatchMenuItem
-            // 
-            this.EditWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
-            this.EditWatchMenuItem.Text = "&Edit Watch";
-            this.EditWatchMenuItem.Click += new System.EventHandler(this.EditWatchMenuItem_Click);
-            // 
-            // RemoveWatchMenuItem
-            // 
-            this.RemoveWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R)));
-            this.RemoveWatchMenuItem.Text = "&Remove Watch";
-            this.RemoveWatchMenuItem.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click);
-            // 
-            // DuplicateWatchMenuItem
-            // 
-            this.DuplicateWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
-            this.DuplicateWatchMenuItem.Text = "&Duplicate Watch";
-            this.DuplicateWatchMenuItem.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click);
-            // 
-            // SplitWatchMenuItem
-            // 
-            this.SplitWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L)));
-            this.SplitWatchMenuItem.Text = "Sp&lit Watch";
-            this.SplitWatchMenuItem.Click += new System.EventHandler(this.SplitWatchMenuItem_Click);
-            // 
-            // PokeAddressMenuItem
-            // 
-            this.PokeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
-            this.PokeAddressMenuItem.Text = "Poke Address";
-            this.PokeAddressMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click);
-            // 
-            // FreezeAddressMenuItem
-            // 
-            this.FreezeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
-            this.FreezeAddressMenuItem.Text = "Freeze Address";
-            this.FreezeAddressMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click);
-            // 
-            // InsertSeparatorMenuItem
-            // 
-            this.InsertSeparatorMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I)));
-            this.InsertSeparatorMenuItem.Text = "Insert Separator";
-            this.InsertSeparatorMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click);
-            // 
-            // ClearChangeCountsMenuItem
-            // 
-            this.ClearChangeCountsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.C)));
-            this.ClearChangeCountsMenuItem.Text = "&Clear Change Counts";
-            this.ClearChangeCountsMenuItem.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click);
-            // 
-            // MoveUpMenuItem
-            // 
-            this.MoveUpMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up)));
-            this.MoveUpMenuItem.Text = "Move &Up";
-            this.MoveUpMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click);
-            // 
-            // MoveDownMenuItem
-            // 
-            this.MoveDownMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down)));
-            this.MoveDownMenuItem.Text = "Move &Down";
-            this.MoveDownMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click);
-            // 
-            // MoveTopMenuItem
-            // 
-            this.MoveTopMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
-            | System.Windows.Forms.Keys.Up)));
-            this.MoveTopMenuItem.Text = "Move &Top";
-            this.MoveTopMenuItem.Click += new System.EventHandler(this.MoveTopMenuItem_Click);
-            // 
-            // MoveBottomMenuItem
-            // 
-            this.MoveBottomMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
-            | System.Windows.Forms.Keys.Down)));
-            this.MoveBottomMenuItem.Text = "Move &Bottom";
-            this.MoveBottomMenuItem.Click += new System.EventHandler(this.MoveBottomMenuItem_Click);
-            // 
-            // SelectAllMenuItem
-            // 
-            this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
-            this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A";
-            this.SelectAllMenuItem.Text = "Select &All";
-            this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click);
+			this.WatchesSubMenu.Text = "&Watches";
+			this.WatchesSubMenu.DropDownOpened += new System.EventHandler(this.WatchesSubMenu_DropDownOpened);
 			// 
-            // OptionsSubMenu
-            // 
-            this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			// MemoryDomainsSubMenu
+			// 
+			this.MemoryDomainsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.Separator2});
+			this.MemoryDomainsSubMenu.Text = "Default Domain";
+			this.MemoryDomainsSubMenu.DropDownOpened += new System.EventHandler(this.MemoryDomainsSubMenu_DropDownOpened);
+			// 
+			// NewWatchMenuItem
+			// 
+			this.NewWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
+			this.NewWatchMenuItem.Text = "&New Watch";
+			this.NewWatchMenuItem.Click += new System.EventHandler(this.NewWatchMenuItem_Click);
+			// 
+			// EditWatchMenuItem
+			// 
+			this.EditWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
+			this.EditWatchMenuItem.Text = "&Edit Watch";
+			this.EditWatchMenuItem.Click += new System.EventHandler(this.EditWatchMenuItem_Click);
+			// 
+			// RemoveWatchMenuItem
+			// 
+			this.RemoveWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R)));
+			this.RemoveWatchMenuItem.Text = "&Remove Watch";
+			this.RemoveWatchMenuItem.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click);
+			// 
+			// DuplicateWatchMenuItem
+			// 
+			this.DuplicateWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
+			this.DuplicateWatchMenuItem.Text = "&Duplicate Watch";
+			this.DuplicateWatchMenuItem.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click);
+			// 
+			// SplitWatchMenuItem
+			// 
+			this.SplitWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L)));
+			this.SplitWatchMenuItem.Text = "Sp&lit Watch";
+			this.SplitWatchMenuItem.Click += new System.EventHandler(this.SplitWatchMenuItem_Click);
+			// 
+			// PokeAddressMenuItem
+			// 
+			this.PokeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
+			this.PokeAddressMenuItem.Text = "Poke Address";
+			this.PokeAddressMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click);
+			// 
+			// FreezeAddressMenuItem
+			// 
+			this.FreezeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
+			this.FreezeAddressMenuItem.Text = "Freeze Address";
+			this.FreezeAddressMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click);
+			// 
+			// InsertSeparatorMenuItem
+			// 
+			this.InsertSeparatorMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I)));
+			this.InsertSeparatorMenuItem.Text = "Insert Separator";
+			this.InsertSeparatorMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click);
+			// 
+			// ClearChangeCountsMenuItem
+			// 
+			this.ClearChangeCountsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.C)));
+			this.ClearChangeCountsMenuItem.Text = "&Clear Change Counts";
+			this.ClearChangeCountsMenuItem.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click);
+			// 
+			// MoveUpMenuItem
+			// 
+			this.MoveUpMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up)));
+			this.MoveUpMenuItem.Text = "Move &Up";
+			this.MoveUpMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click);
+			// 
+			// MoveDownMenuItem
+			// 
+			this.MoveDownMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down)));
+			this.MoveDownMenuItem.Text = "Move &Down";
+			this.MoveDownMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click);
+			// 
+			// MoveTopMenuItem
+			// 
+			this.MoveTopMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
+            | System.Windows.Forms.Keys.Up)));
+			this.MoveTopMenuItem.Text = "Move &Top";
+			this.MoveTopMenuItem.Click += new System.EventHandler(this.MoveTopMenuItem_Click);
+			// 
+			// MoveBottomMenuItem
+			// 
+			this.MoveBottomMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
+            | System.Windows.Forms.Keys.Down)));
+			this.MoveBottomMenuItem.Text = "Move &Bottom";
+			this.MoveBottomMenuItem.Click += new System.EventHandler(this.MoveBottomMenuItem_Click);
+			// 
+			// SelectAllMenuItem
+			// 
+			this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A";
+			this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
+			this.SelectAllMenuItem.Text = "Select &All";
+			this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click);
+			// 
+			// OptionsSubMenu
+			// 
+			this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.DefinePreviousValueSubMenu,
             this.WatchesOnScreenMenuItem,
             this.DoubleClickActionSubMenu});
-            this.OptionsSubMenu.Text = "&Settings";
-            this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.SettingsSubMenu_DropDownOpened);
-            // 
-            // DefinePreviousValueSubMenu
-            // 
-            this.DefinePreviousValueSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.OptionsSubMenu.Text = "&Settings";
+			this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.SettingsSubMenu_DropDownOpened);
+			// 
+			// DefinePreviousValueSubMenu
+			// 
+			this.DefinePreviousValueSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.PreviousFrameMenuItem,
             this.LastChangeMenuItem,
             this.OriginalMenuItem});
-            this.DefinePreviousValueSubMenu.Text = "Define Previous Value";
-            this.DefinePreviousValueSubMenu.DropDownOpened += new System.EventHandler(this.DefinePreviousValueSubMenu_DropDownOpened);
-            // 
-            // PreviousFrameMenuItem
-            // 
-            this.PreviousFrameMenuItem.Text = "Previous Frame";
-            this.PreviousFrameMenuItem.Click += new System.EventHandler(this.PreviousFrameMenuItem_Click);
-            // 
-            // LastChangeMenuItem
-            // 
-            this.LastChangeMenuItem.Text = "Last Change";
-            this.LastChangeMenuItem.Click += new System.EventHandler(this.LastChangeMenuItem_Click);
-            // 
-            // OriginalMenuItem
-            // 
-            this.OriginalMenuItem.Text = "&Original";
-            this.OriginalMenuItem.Click += new System.EventHandler(this.OriginalMenuItem_Click);
-            // 
-            // WatchesOnScreenMenuItem
-            // 
-            this.WatchesOnScreenMenuItem.Text = "Display Watches On Screen";
-            this.WatchesOnScreenMenuItem.Click += new System.EventHandler(this.WatchesOnScreenMenuItem_Click);
+			this.DefinePreviousValueSubMenu.Text = "Define Previous Value";
+			this.DefinePreviousValueSubMenu.DropDownOpened += new System.EventHandler(this.DefinePreviousValueSubMenu_DropDownOpened);
 			// 
-            // WatchListView
-            // 
-			this.WatchListView.CellWidthPadding = 3;
-            this.WatchListView.AllowColumnResize = true;
-            this.WatchListView.AllowColumnReorder = true;
-            this.WatchListView.FullRowSelect = true;
-            this.WatchListView.MultiSelect = true;
-            this.WatchListView.AllowColumnReorder = true;
-            this.WatchListView.AllowDrop = true;
-            this.WatchListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.WatchListView.ContextMenuStrip = this.ListViewContextMenu;
-            this.WatchListView.FullRowSelect = true;
-            this.WatchListView.GridLines = true;
-            this.WatchListView.Location = new System.Drawing.Point(16, 76);
-            this.WatchListView.Name = "WatchListView";
-            this.WatchListView.Size = new System.Drawing.Size(363, 281);
-            this.WatchListView.TabIndex = 2;
-            this.WatchListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.WatchListView_ColumnClick);
-            this.WatchListView.SelectedIndexChanged += new System.EventHandler(this.WatchListView_SelectedIndexChanged);
-            this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.RamWatch_DragDrop);
-            this.WatchListView.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper);
-            this.WatchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown);
-            this.WatchListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.WatchListView_MouseDoubleClick);
-            // 
-            // DoubleClickActionSubMenu
-            // 
-            this.DoubleClickActionSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			// PreviousFrameMenuItem
+			// 
+			this.PreviousFrameMenuItem.Text = "Previous Frame";
+			this.PreviousFrameMenuItem.Click += new System.EventHandler(this.PreviousFrameMenuItem_Click);
+			// 
+			// LastChangeMenuItem
+			// 
+			this.LastChangeMenuItem.Text = "Last Change";
+			this.LastChangeMenuItem.Click += new System.EventHandler(this.LastChangeMenuItem_Click);
+			// 
+			// OriginalMenuItem
+			// 
+			this.OriginalMenuItem.Text = "&Original";
+			this.OriginalMenuItem.Click += new System.EventHandler(this.OriginalMenuItem_Click);
+			// 
+			// WatchesOnScreenMenuItem
+			// 
+			this.WatchesOnScreenMenuItem.Text = "Display Watches On Screen";
+			this.WatchesOnScreenMenuItem.Click += new System.EventHandler(this.WatchesOnScreenMenuItem_Click);
+			// 
+			// DoubleClickActionSubMenu
+			// 
+			this.DoubleClickActionSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.DoubleClickToEditMenuItem,
             this.DoubleClickToPokeMenuItem});
-            this.DoubleClickActionSubMenu.Text = "On Double-Clicking a Watch";
-            this.DoubleClickActionSubMenu.DropDownOpening += new System.EventHandler(this.DoubleClickActionSubMenu_DropDownOpening);
-            // 
-            // DoubleClickToEditMenuItem
-            // 
-            this.DoubleClickToEditMenuItem.Text = "Edit Watch";
-            this.DoubleClickToEditMenuItem.Click += new System.EventHandler(this.DoubleClickToEditMenuItem_Click);
-            // 
-            // DoubleClickToPokeMenuItem
-            // 
-            this.DoubleClickToPokeMenuItem.Text = "Poke Address";
-            this.DoubleClickToPokeMenuItem.Click += new System.EventHandler(this.DoubleClickToPokeMenuItem_Click);
-            // 
-            // RamWatch
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(395, 378);
-            this.Controls.Add(this.statusStrip1);
-            this.Controls.Add(this.WatchCountLabel);
-            this.Controls.Add(this.toolStrip1);
-            this.Controls.Add(this.RamWatchMenu);
-            this.Controls.Add(this.WatchListView);
-            this.Name = "RamWatch";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Load += new System.EventHandler(this.RamWatch_Load);
-            this.DragDrop += new System.Windows.Forms.DragEventHandler(this.RamWatch_DragDrop);
-            this.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper);
-            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown);
-            this.ListViewContextMenu.ResumeLayout(false);
-            this.statusStrip1.ResumeLayout(false);
-            this.statusStrip1.PerformLayout();
-            this.toolStrip1.ResumeLayout(false);
-            this.toolStrip1.PerformLayout();
-            this.RamWatchMenu.ResumeLayout(false);
-            this.RamWatchMenu.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
+			this.DoubleClickActionSubMenu.Text = "On Double-Clicking a Watch";
+			this.DoubleClickActionSubMenu.DropDownOpening += new System.EventHandler(this.DoubleClickActionSubMenu_DropDownOpening);
+			// 
+			// DoubleClickToEditMenuItem
+			// 
+			this.DoubleClickToEditMenuItem.Text = "Edit Watch";
+			this.DoubleClickToEditMenuItem.Click += new System.EventHandler(this.DoubleClickToEditMenuItem_Click);
+			// 
+			// DoubleClickToPokeMenuItem
+			// 
+			this.DoubleClickToPokeMenuItem.Text = "Poke Address";
+			this.DoubleClickToPokeMenuItem.Click += new System.EventHandler(this.DoubleClickToPokeMenuItem_Click);
+			// 
+			// WatchListView
+			// 
+			this.WatchListView.AllowColumnReorder = true;
+			this.WatchListView.AllowColumnResize = true;
+			this.WatchListView.AllowDrop = true;
+			this.WatchListView.AlwaysScroll = false;
+			this.WatchListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.WatchListView.CellHeightPadding = 0;
+			this.WatchListView.CellWidthPadding = 0;
+			this.WatchListView.ContextMenuStrip = this.ListViewContextMenu;
+			this.WatchListView.FullRowSelect = true;
+			this.WatchListView.HorizontalOrientation = false;
+			this.WatchListView.LetKeysModifySelection = false;
+			this.WatchListView.Location = new System.Drawing.Point(16, 76);
+			this.WatchListView.Name = "WatchListView";
+			this.WatchListView.RowCount = 0;
+			this.WatchListView.ScrollSpeed = 0;
+			this.WatchListView.SeekingCutoffInterval = 0;
+			this.WatchListView.Size = new System.Drawing.Size(363, 281);
+			this.WatchListView.TabIndex = 2;
+			this.WatchListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.WatchListView_ColumnClick);
+			this.WatchListView.SelectedIndexChanged += new System.EventHandler(this.WatchListView_SelectedIndexChanged);
+			this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.RamWatch_DragDrop);
+			this.WatchListView.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper);
+			this.WatchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown);
+			this.WatchListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.WatchListView_MouseDoubleClick);
+			// 
+			// RamWatch
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(395, 378);
+			this.Controls.Add(this.statusStrip1);
+			this.Controls.Add(this.WatchCountLabel);
+			this.Controls.Add(this.toolStrip1);
+			this.Controls.Add(this.RamWatchMenu);
+			this.Controls.Add(this.WatchListView);
+			this.Name = "RamWatch";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Load += new System.EventHandler(this.RamWatch_Load);
+			this.DragDrop += new System.Windows.Forms.DragEventHandler(this.RamWatch_DragDrop);
+			this.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper);
+			this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown);
+			this.ListViewContextMenu.ResumeLayout(false);
+			this.statusStrip1.ResumeLayout(false);
+			this.statusStrip1.PerformLayout();
+			this.toolStrip1.ResumeLayout(false);
+			this.toolStrip1.PerformLayout();
+			this.RamWatchMenu.ResumeLayout(false);
+			this.RamWatchMenu.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
 
 		}