diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 2d39f87276..ace012897a 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -1657,6 +1657,11 @@
     <None Include="config\ControllerImages\GENController.png" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="images\tastudio\icon_anchor_lag.png" />
+    <None Include="images\tastudio\icon_anchor.png" />
+    <None Include="images\tastudio\icon_marker.png" />
+    <None Include="images\tastudio\anchor_marker.png" />
+    <None Include="images\tastudio\anchor_lag.png" />
     <None Include="images\tastudio\anchor.png" />
     <None Include="Resources\HawkInLove.png" />
     <None Include="images\Circle.png" />
diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
index 3dddd2588b..b94ccc7448 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.0
+//     Runtime Version:4.0.30319.1
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -60,9 +60,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap A78Joystick {
             get {
                 object obj = ResourceManager.GetObject("A78Joystick", resourceCulture);
@@ -70,9 +67,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap add {
             get {
                 object obj = ResourceManager.GetObject("add", resourceCulture);
@@ -80,9 +74,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap addWatch {
             get {
                 object obj = ResourceManager.GetObject("addWatch", resourceCulture);
@@ -90,9 +81,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap alt_about_image {
             get {
                 object obj = ResourceManager.GetObject("alt_about_image", resourceCulture);
@@ -100,19 +88,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap anchor {
-            get {
-                object obj = ResourceManager.GetObject("anchor", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap AppleIIKeyboard {
             get {
                 object obj = ResourceManager.GetObject("AppleIIKeyboard", resourceCulture);
@@ -120,9 +95,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap atari_controller {
             get {
                 object obj = ResourceManager.GetObject("atari_controller", resourceCulture);
@@ -130,9 +102,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap AudioHS {
             get {
                 object obj = ResourceManager.GetObject("AudioHS", resourceCulture);
@@ -140,9 +109,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap AutoSearch {
             get {
                 object obj = ResourceManager.GetObject("AutoSearch", resourceCulture);
@@ -150,9 +116,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap AVI {
             get {
                 object obj = ResourceManager.GetObject("AVI", resourceCulture);
@@ -160,9 +123,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Back {
             get {
                 object obj = ResourceManager.GetObject("Back", resourceCulture);
@@ -170,9 +130,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap BackMore {
             get {
                 object obj = ResourceManager.GetObject("BackMore", resourceCulture);
@@ -180,9 +137,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Blank {
             get {
                 object obj = ResourceManager.GetObject("Blank", resourceCulture);
@@ -190,9 +144,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
-        /// </summary>
         internal static byte[] BlankCursor {
             get {
                 object obj = ResourceManager.GetObject("BlankCursor", resourceCulture);
@@ -200,9 +151,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap BlueDown {
             get {
                 object obj = ResourceManager.GetObject("BlueDown", resourceCulture);
@@ -210,9 +158,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap BlueUp {
             get {
                 object obj = ResourceManager.GetObject("BlueUp", resourceCulture);
@@ -220,9 +165,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Both {
             get {
                 object obj = ResourceManager.GetObject("Both", resourceCulture);
@@ -230,9 +172,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap bsnes {
             get {
                 object obj = ResourceManager.GetObject("bsnes", resourceCulture);
@@ -240,9 +179,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Bug {
             get {
                 object obj = ResourceManager.GetObject("Bug", resourceCulture);
@@ -250,9 +186,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap C64Joystick {
             get {
                 object obj = ResourceManager.GetObject("C64Joystick", resourceCulture);
@@ -260,9 +193,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap C64Keyboard {
             get {
                 object obj = ResourceManager.GetObject("C64Keyboard", resourceCulture);
@@ -270,9 +200,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap C64Symbol {
             get {
                 object obj = ResourceManager.GetObject("C64Symbol", resourceCulture);
@@ -280,9 +207,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap calculator {
             get {
                 object obj = ResourceManager.GetObject("calculator", resourceCulture);
@@ -290,9 +214,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap camera {
             get {
                 object obj = ResourceManager.GetObject("camera", resourceCulture);
@@ -300,9 +221,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap cheat {
             get {
                 object obj = ResourceManager.GetObject("cheat", resourceCulture);
@@ -310,9 +228,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
-        /// </summary>
         internal static System.Drawing.Icon Cheats {
             get {
                 object obj = ResourceManager.GetObject("Cheats", resourceCulture);
@@ -320,9 +235,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap checkbox {
             get {
                 object obj = ResourceManager.GetObject("checkbox", resourceCulture);
@@ -330,9 +242,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Circle {
             get {
                 object obj = ResourceManager.GetObject("Circle", resourceCulture);
@@ -340,9 +249,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Close {
             get {
                 object obj = ResourceManager.GetObject("Close", resourceCulture);
@@ -350,9 +256,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap colecovisioncontroller {
             get {
                 object obj = ResourceManager.GetObject("colecovisioncontroller", resourceCulture);
@@ -360,9 +263,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap connect_16x16 {
             get {
                 object obj = ResourceManager.GetObject("connect_16x16", resourceCulture);
@@ -370,9 +270,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap console16x16 {
             get {
                 object obj = ResourceManager.GetObject("console16x16", resourceCulture);
@@ -380,9 +277,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap console32x32 {
             get {
                 object obj = ResourceManager.GetObject("console32x32", resourceCulture);
@@ -390,9 +284,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap CopyFolderHS {
             get {
                 object obj = ResourceManager.GetObject("CopyFolderHS", resourceCulture);
@@ -400,9 +291,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap corphawk {
             get {
                 object obj = ResourceManager.GetObject("corphawk", resourceCulture);
@@ -410,9 +298,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap CorpHawkSmall {
             get {
                 object obj = ResourceManager.GetObject("CorpHawkSmall", resourceCulture);
@@ -420,9 +305,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Cross {
             get {
                 object obj = ResourceManager.GetObject("Cross", resourceCulture);
@@ -430,9 +312,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap CutHS {
             get {
                 object obj = ResourceManager.GetObject("CutHS", resourceCulture);
@@ -440,9 +319,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Debugger {
             get {
                 object obj = ResourceManager.GetObject("Debugger", resourceCulture);
@@ -450,9 +326,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Delete {
             get {
                 object obj = ResourceManager.GetObject("Delete", resourceCulture);
@@ -460,9 +333,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap dual {
             get {
                 object obj = ResourceManager.GetObject("dual", resourceCulture);
@@ -470,9 +340,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Duplicate {
             get {
                 object obj = ResourceManager.GetObject("Duplicate", resourceCulture);
@@ -480,9 +347,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap emu7800 {
             get {
                 object obj = ResourceManager.GetObject("emu7800", resourceCulture);
@@ -490,9 +354,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Erase {
             get {
                 object obj = ResourceManager.GetObject("Erase", resourceCulture);
@@ -500,9 +361,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ExclamationRed {
             get {
                 object obj = ResourceManager.GetObject("ExclamationRed", resourceCulture);
@@ -510,9 +368,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap FastForward {
             get {
                 object obj = ResourceManager.GetObject("FastForward", resourceCulture);
@@ -520,9 +375,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap FindHS {
             get {
                 object obj = ResourceManager.GetObject("FindHS", resourceCulture);
@@ -530,9 +382,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Forward {
             get {
                 object obj = ResourceManager.GetObject("Forward", resourceCulture);
@@ -540,9 +389,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ForwardMore {
             get {
                 object obj = ResourceManager.GetObject("ForwardMore", resourceCulture);
@@ -550,9 +396,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Freeze {
             get {
                 object obj = ResourceManager.GetObject("Freeze", resourceCulture);
@@ -560,9 +403,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Fullscreen {
             get {
                 object obj = ResourceManager.GetObject("Fullscreen", resourceCulture);
@@ -570,9 +410,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap gambatte {
             get {
                 object obj = ResourceManager.GetObject("gambatte", resourceCulture);
@@ -580,9 +417,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap GameController {
             get {
                 object obj = ResourceManager.GetObject("GameController", resourceCulture);
@@ -590,9 +424,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap GBA_Controller {
             get {
                 object obj = ResourceManager.GetObject("GBA_Controller", resourceCulture);
@@ -600,9 +431,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap gba_icon {
             get {
                 object obj = ResourceManager.GetObject("gba_icon", resourceCulture);
@@ -610,9 +438,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap GBController {
             get {
                 object obj = ResourceManager.GetObject("GBController", resourceCulture);
@@ -620,9 +445,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap GENController {
             get {
                 object obj = ResourceManager.GetObject("GENController", resourceCulture);
@@ -630,9 +452,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap GenesisControllerIcon {
             get {
                 object obj = ResourceManager.GetObject("GenesisControllerIcon", resourceCulture);
@@ -640,9 +459,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap genplus {
             get {
                 object obj = ResourceManager.GetObject("genplus", resourceCulture);
@@ -650,9 +466,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap GreenCheck {
             get {
                 object obj = ResourceManager.GetObject("GreenCheck", resourceCulture);
@@ -660,9 +473,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Hack {
             get {
                 object obj = ResourceManager.GetObject("Hack", resourceCulture);
@@ -670,9 +480,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap HawkInLove {
             get {
                 object obj = ResourceManager.GetObject("HawkInLove", resourceCulture);
@@ -680,9 +487,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Help {
             get {
                 object obj = ResourceManager.GetObject("Help", resourceCulture);
@@ -690,9 +494,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap HomeBrew {
             get {
                 object obj = ResourceManager.GetObject("HomeBrew", resourceCulture);
@@ -700,9 +501,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap HotKeys {
             get {
                 object obj = ResourceManager.GetObject("HotKeys", resourceCulture);
@@ -710,9 +508,27 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
+        internal static System.Drawing.Bitmap icon_anchor {
+            get {
+                object obj = ResourceManager.GetObject("icon_anchor", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap icon_anchor_lag {
+            get {
+                object obj = ResourceManager.GetObject("icon_anchor_lag", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap icon_marker {
+            get {
+                object obj = ResourceManager.GetObject("icon_marker", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap Import {
             get {
                 object obj = ResourceManager.GetObject("Import", resourceCulture);
@@ -720,9 +536,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap InsertSeparator {
             get {
                 object obj = ResourceManager.GetObject("InsertSeparator", resourceCulture);
@@ -730,9 +543,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap IntVController {
             get {
                 object obj = ResourceManager.GetObject("IntVController", resourceCulture);
@@ -740,9 +550,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap kitchensink {
             get {
                 object obj = ResourceManager.GetObject("kitchensink", resourceCulture);
@@ -760,9 +567,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap LightOff {
             get {
                 object obj = ResourceManager.GetObject("LightOff", resourceCulture);
@@ -770,9 +574,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap LightOn {
             get {
                 object obj = ResourceManager.GetObject("LightOn", resourceCulture);
@@ -780,9 +581,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap LoadConfig {
             get {
                 object obj = ResourceManager.GetObject("LoadConfig", resourceCulture);
@@ -790,9 +588,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
-        /// </summary>
         internal static System.Drawing.Icon logo {
             get {
                 object obj = ResourceManager.GetObject("logo", resourceCulture);
@@ -800,9 +595,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Lua {
             get {
                 object obj = ResourceManager.GetObject("Lua", resourceCulture);
@@ -810,9 +602,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Lynx {
             get {
                 object obj = ResourceManager.GetObject("Lynx", resourceCulture);
@@ -820,9 +609,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap MessageConfig {
             get {
                 object obj = ResourceManager.GetObject("MessageConfig", resourceCulture);
@@ -830,9 +616,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap meteor {
             get {
                 object obj = ResourceManager.GetObject("meteor", resourceCulture);
@@ -840,9 +623,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap monitor {
             get {
                 object obj = ResourceManager.GetObject("monitor", resourceCulture);
@@ -850,9 +630,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap MoveDown {
             get {
                 object obj = ResourceManager.GetObject("MoveDown", resourceCulture);
@@ -860,9 +637,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap MoveLeft {
             get {
                 object obj = ResourceManager.GetObject("MoveLeft", resourceCulture);
@@ -870,9 +644,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap MoveRight {
             get {
                 object obj = ResourceManager.GetObject("MoveRight", resourceCulture);
@@ -880,9 +651,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap MoveUp {
             get {
                 object obj = ResourceManager.GetObject("MoveUp", resourceCulture);
@@ -890,9 +658,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap N64 {
             get {
                 object obj = ResourceManager.GetObject("N64", resourceCulture);
@@ -900,9 +665,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap NES_Controller {
             get {
                 object obj = ResourceManager.GetObject("NES_Controller", resourceCulture);
@@ -910,9 +672,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap NESControllerIcon {
             get {
                 object obj = ResourceManager.GetObject("NESControllerIcon", resourceCulture);
@@ -920,9 +679,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap NewFile {
             get {
                 object obj = ResourceManager.GetObject("NewFile", resourceCulture);
@@ -930,9 +686,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap noconnect_16x16 {
             get {
                 object obj = ResourceManager.GetObject("noconnect_16x16", resourceCulture);
@@ -940,18 +693,12 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
-        /// </summary>
         internal static System.IO.UnmanagedMemoryStream nothawk {
             get {
                 return ResourceManager.GetStream("nothawk", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap OpenFile {
             get {
                 object obj = ResourceManager.GetObject("OpenFile", resourceCulture);
@@ -959,9 +706,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Paste {
             get {
                 object obj = ResourceManager.GetObject("Paste", resourceCulture);
@@ -969,9 +713,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Pause {
             get {
                 object obj = ResourceManager.GetObject("Pause", resourceCulture);
@@ -979,9 +720,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap pcb {
             get {
                 object obj = ResourceManager.GetObject("pcb", resourceCulture);
@@ -989,9 +727,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap pcejin1 {
             get {
                 object obj = ResourceManager.GetObject("pcejin1", resourceCulture);
@@ -999,9 +734,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap PCEngineController {
             get {
                 object obj = ResourceManager.GetObject("PCEngineController", resourceCulture);
@@ -1009,9 +741,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap pencil {
             get {
                 object obj = ResourceManager.GetObject("pencil", resourceCulture);
@@ -1019,9 +748,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Play {
             get {
                 object obj = ResourceManager.GetObject("Play", resourceCulture);
@@ -1029,9 +755,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap poke {
             get {
                 object obj = ResourceManager.GetObject("poke", resourceCulture);
@@ -1039,9 +762,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ppsspp {
             get {
                 object obj = ResourceManager.GetObject("ppsspp", resourceCulture);
@@ -1049,9 +769,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Previous {
             get {
                 object obj = ResourceManager.GetObject("Previous", resourceCulture);
@@ -1059,9 +776,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap PrintPreviewHS {
             get {
                 object obj = ResourceManager.GetObject("PrintPreviewHS", resourceCulture);
@@ -1069,9 +783,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap psx_dualshock {
             get {
                 object obj = ResourceManager.GetObject("psx_dualshock", resourceCulture);
@@ -1079,9 +790,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap PSX_Original_Controller {
             get {
                 object obj = ResourceManager.GetObject("PSX_Original_Controller", resourceCulture);
@@ -1089,9 +797,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap QuickNes {
             get {
                 object obj = ResourceManager.GetObject("QuickNes", resourceCulture);
@@ -1099,9 +804,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ReadOnly {
             get {
                 object obj = ResourceManager.GetObject("ReadOnly", resourceCulture);
@@ -1109,9 +811,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap reboot {
             get {
                 object obj = ResourceManager.GetObject("reboot", resourceCulture);
@@ -1119,9 +818,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Recent {
             get {
                 object obj = ResourceManager.GetObject("Recent", resourceCulture);
@@ -1129,9 +825,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap RecordHS {
             get {
                 object obj = ResourceManager.GetObject("RecordHS", resourceCulture);
@@ -1139,9 +832,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap redo {
             get {
                 object obj = ResourceManager.GetObject("redo", resourceCulture);
@@ -1149,9 +839,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Refresh {
             get {
                 object obj = ResourceManager.GetObject("Refresh", resourceCulture);
@@ -1159,9 +846,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Refresh1 {
             get {
                 object obj = ResourceManager.GetObject("Refresh1", resourceCulture);
@@ -1169,9 +853,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap restart {
             get {
                 object obj = ResourceManager.GetObject("restart", resourceCulture);
@@ -1179,9 +860,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap RetroQuestion {
             get {
                 object obj = ResourceManager.GetObject("RetroQuestion", resourceCulture);
@@ -1189,9 +867,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap SaturnController {
             get {
                 object obj = ResourceManager.GetObject("SaturnController", resourceCulture);
@@ -1199,9 +874,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Save {
             get {
                 object obj = ResourceManager.GetObject("Save", resourceCulture);
@@ -1209,9 +881,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap SaveAs {
             get {
                 object obj = ResourceManager.GetObject("SaveAs", resourceCulture);
@@ -1219,9 +888,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap SaveConfig {
             get {
                 object obj = ResourceManager.GetObject("SaveConfig", resourceCulture);
@@ -1229,9 +895,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Scan {
             get {
                 object obj = ResourceManager.GetObject("Scan", resourceCulture);
@@ -1239,9 +902,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap search {
             get {
                 object obj = ResourceManager.GetObject("search", resourceCulture);
@@ -1249,9 +909,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap sms_icon {
             get {
                 object obj = ResourceManager.GetObject("sms_icon", resourceCulture);
@@ -1259,9 +916,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap SMSController {
             get {
                 object obj = ResourceManager.GetObject("SMSController", resourceCulture);
@@ -1269,9 +923,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap SNES_Controller {
             get {
                 object obj = ResourceManager.GetObject("SNES_Controller", resourceCulture);
@@ -1279,9 +930,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap snes9x {
             get {
                 object obj = ResourceManager.GetObject("snes9x", resourceCulture);
@@ -1289,9 +937,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap SNESControllerIcon {
             get {
                 object obj = ResourceManager.GetObject("SNESControllerIcon", resourceCulture);
@@ -1299,9 +944,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Square {
             get {
                 object obj = ResourceManager.GetObject("Square", resourceCulture);
@@ -1309,9 +951,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Stop {
             get {
                 object obj = ResourceManager.GetObject("Stop", resourceCulture);
@@ -1319,9 +958,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap TAStudio {
             get {
                 object obj = ResourceManager.GetObject("TAStudio", resourceCulture);
@@ -1329,9 +965,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap textdoc {
             get {
                 object obj = ResourceManager.GetObject("textdoc", resourceCulture);
@@ -1339,9 +972,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap thumbsdown {
             get {
                 object obj = ResourceManager.GetObject("thumbsdown", resourceCulture);
@@ -1349,9 +979,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap TI83_Controller {
             get {
                 object obj = ResourceManager.GetObject("TI83_Controller", resourceCulture);
@@ -1359,9 +986,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap TI83Calculator {
             get {
                 object obj = ResourceManager.GetObject("TI83Calculator", resourceCulture);
@@ -1369,9 +993,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ToolBox {
             get {
                 object obj = ResourceManager.GetObject("ToolBox", resourceCulture);
@@ -1379,9 +1000,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Translation {
             get {
                 object obj = ResourceManager.GetObject("Translation", resourceCulture);
@@ -1389,9 +1007,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Triangle {
             get {
                 object obj = ResourceManager.GetObject("Triangle", resourceCulture);
@@ -1399,9 +1014,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap TruncateFromFile {
             get {
                 object obj = ResourceManager.GetObject("TruncateFromFile", resourceCulture);
@@ -1409,9 +1021,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap TruncateFromRW {
             get {
                 object obj = ResourceManager.GetObject("TruncateFromRW", resourceCulture);
@@ -1419,9 +1028,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_arrow_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_arrow_blue", resourceCulture);
@@ -1429,9 +1035,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_arrow_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_arrow_green", resourceCulture);
@@ -1439,9 +1042,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_arrow_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_arrow_green_blue", resourceCulture);
@@ -1449,9 +1049,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_00 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_00", resourceCulture);
@@ -1459,9 +1056,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_00_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_00_blue", resourceCulture);
@@ -1469,9 +1063,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_00_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_00_green", resourceCulture);
@@ -1479,9 +1070,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_00_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_00_green_blue", resourceCulture);
@@ -1489,9 +1077,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_01 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_01", resourceCulture);
@@ -1499,9 +1084,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_01_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_01_blue", resourceCulture);
@@ -1509,9 +1091,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_01_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_01_green", resourceCulture);
@@ -1519,9 +1098,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_01_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_01_green_blue", resourceCulture);
@@ -1529,9 +1105,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_02 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_02", resourceCulture);
@@ -1539,9 +1112,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_02_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_02_blue", resourceCulture);
@@ -1549,9 +1119,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_02_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_02_green", resourceCulture);
@@ -1559,9 +1126,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_02_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_02_green_blue", resourceCulture);
@@ -1569,9 +1133,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_03 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_03", resourceCulture);
@@ -1579,9 +1140,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_03_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_03_blue", resourceCulture);
@@ -1589,9 +1147,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_03_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_03_green", resourceCulture);
@@ -1599,9 +1154,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_03_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_03_green_blue", resourceCulture);
@@ -1609,9 +1161,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_04 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_04", resourceCulture);
@@ -1619,9 +1168,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_04_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_04_blue", resourceCulture);
@@ -1629,9 +1175,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_04_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_04_green", resourceCulture);
@@ -1639,9 +1182,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_04_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_04_green_blue", resourceCulture);
@@ -1649,9 +1189,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_05 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_05", resourceCulture);
@@ -1659,9 +1196,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_05_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_05_blue", resourceCulture);
@@ -1669,9 +1203,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_05_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_05_green", resourceCulture);
@@ -1679,9 +1210,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_05_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_05_green_blue", resourceCulture);
@@ -1689,9 +1217,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_06 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_06", resourceCulture);
@@ -1699,9 +1224,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_06_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_06_blue", resourceCulture);
@@ -1709,9 +1231,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_06_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_06_green", resourceCulture);
@@ -1719,9 +1238,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_06_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_06_green_blue", resourceCulture);
@@ -1729,9 +1245,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_07 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_07", resourceCulture);
@@ -1739,9 +1252,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_07_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_07_blue", resourceCulture);
@@ -1749,9 +1259,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_07_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_07_green", resourceCulture);
@@ -1759,9 +1266,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_07_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_07_green_blue", resourceCulture);
@@ -1769,9 +1273,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_08 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_08", resourceCulture);
@@ -1779,9 +1280,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_08_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_08_blue", resourceCulture);
@@ -1789,9 +1287,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_08_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_08_green", resourceCulture);
@@ -1799,9 +1294,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_08_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_08_green_blue", resourceCulture);
@@ -1809,9 +1301,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_09 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_09", resourceCulture);
@@ -1819,9 +1308,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_09_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_09_blue", resourceCulture);
@@ -1829,9 +1315,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_09_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_09_green", resourceCulture);
@@ -1839,9 +1322,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_09_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_09_green_blue", resourceCulture);
@@ -1849,9 +1329,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_10 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_10", resourceCulture);
@@ -1859,9 +1336,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_10_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_10_blue", resourceCulture);
@@ -1869,9 +1343,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_10_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_10_green", resourceCulture);
@@ -1879,9 +1350,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_10_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_10_green_blue", resourceCulture);
@@ -1889,9 +1357,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_11 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_11", resourceCulture);
@@ -1899,9 +1364,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_11_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_11_blue", resourceCulture);
@@ -1909,9 +1371,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_11_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_11_green", resourceCulture);
@@ -1919,9 +1378,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_11_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_11_green_blue", resourceCulture);
@@ -1929,9 +1385,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_12 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_12", resourceCulture);
@@ -1939,9 +1392,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_12_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_12_blue", resourceCulture);
@@ -1949,9 +1399,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_12_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_12_green", resourceCulture);
@@ -1959,9 +1406,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_12_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_12_green_blue", resourceCulture);
@@ -1969,9 +1413,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_13 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_13", resourceCulture);
@@ -1979,9 +1420,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_13_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_13_blue", resourceCulture);
@@ -1989,9 +1427,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_13_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_13_green", resourceCulture);
@@ -1999,9 +1434,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_13_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_13_green_blue", resourceCulture);
@@ -2009,9 +1441,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_14 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_14", resourceCulture);
@@ -2019,9 +1448,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_14_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_14_blue", resourceCulture);
@@ -2029,9 +1455,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_14_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_14_green", resourceCulture);
@@ -2039,9 +1462,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_14_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_14_green_blue", resourceCulture);
@@ -2049,9 +1469,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_15 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_15", resourceCulture);
@@ -2059,9 +1476,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_15_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_15_blue", resourceCulture);
@@ -2069,9 +1483,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_15_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_15_green", resourceCulture);
@@ -2079,9 +1490,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_15_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_15_green_blue", resourceCulture);
@@ -2089,9 +1497,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_16 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_16", resourceCulture);
@@ -2099,9 +1504,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_16_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_16_blue", resourceCulture);
@@ -2109,9 +1511,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_16_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_16_green", resourceCulture);
@@ -2119,9 +1518,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_16_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_16_green_blue", resourceCulture);
@@ -2129,9 +1525,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_17 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_17", resourceCulture);
@@ -2139,9 +1532,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_17_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_17_blue", resourceCulture);
@@ -2149,9 +1539,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_17_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_17_green", resourceCulture);
@@ -2159,9 +1546,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_17_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_17_green_blue", resourceCulture);
@@ -2169,9 +1553,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_18 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_18", resourceCulture);
@@ -2179,9 +1560,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_18_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_18_blue", resourceCulture);
@@ -2189,9 +1567,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_18_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_18_green", resourceCulture);
@@ -2199,9 +1574,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_18_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_18_green_blue", resourceCulture);
@@ -2209,9 +1581,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_19 {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_19", resourceCulture);
@@ -2219,9 +1588,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_19_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_19_blue", resourceCulture);
@@ -2229,9 +1595,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_19_green {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_19_green", resourceCulture);
@@ -2239,9 +1602,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_h_piano_19_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_h_piano_19_green_blue", resourceCulture);
@@ -2249,9 +1609,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_arrow_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_arrow_blue", resourceCulture);
@@ -2259,9 +1616,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_arrow_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_arrow_green", resourceCulture);
@@ -2269,9 +1623,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_arrow_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_arrow_green_blue", resourceCulture);
@@ -2279,9 +1630,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_00 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_00", resourceCulture);
@@ -2289,9 +1637,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_00_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_00_blue", resourceCulture);
@@ -2299,9 +1644,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_00_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_00_green", resourceCulture);
@@ -2309,9 +1651,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_00_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_00_green_blue", resourceCulture);
@@ -2319,9 +1658,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_01 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_01", resourceCulture);
@@ -2329,9 +1665,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_01_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_01_blue", resourceCulture);
@@ -2339,9 +1672,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_01_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_01_green", resourceCulture);
@@ -2349,9 +1679,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_01_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_01_green_blue", resourceCulture);
@@ -2359,9 +1686,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_02 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_02", resourceCulture);
@@ -2369,9 +1693,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_02_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_02_blue", resourceCulture);
@@ -2379,9 +1700,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_02_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_02_green", resourceCulture);
@@ -2389,9 +1707,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_02_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_02_green_blue", resourceCulture);
@@ -2399,9 +1714,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_03 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_03", resourceCulture);
@@ -2409,9 +1721,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_03_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_03_blue", resourceCulture);
@@ -2419,9 +1728,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_03_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_03_green", resourceCulture);
@@ -2429,9 +1735,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_03_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_03_green_blue", resourceCulture);
@@ -2439,9 +1742,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_04 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_04", resourceCulture);
@@ -2449,9 +1749,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_04_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_04_blue", resourceCulture);
@@ -2459,9 +1756,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_04_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_04_green", resourceCulture);
@@ -2469,9 +1763,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_04_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_04_green_blue", resourceCulture);
@@ -2479,9 +1770,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_05 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_05", resourceCulture);
@@ -2489,9 +1777,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_05_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_05_blue", resourceCulture);
@@ -2499,9 +1784,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_05_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_05_green", resourceCulture);
@@ -2509,9 +1791,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_05_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_05_green_blue", resourceCulture);
@@ -2519,9 +1798,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_06 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_06", resourceCulture);
@@ -2529,9 +1805,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_06_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_06_blue", resourceCulture);
@@ -2539,9 +1812,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_06_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_06_green", resourceCulture);
@@ -2549,9 +1819,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_06_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_06_green_blue", resourceCulture);
@@ -2559,9 +1826,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_07 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_07", resourceCulture);
@@ -2569,9 +1833,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_07_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_07_blue", resourceCulture);
@@ -2579,9 +1840,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_07_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_07_green", resourceCulture);
@@ -2589,9 +1847,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_07_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_07_green_blue", resourceCulture);
@@ -2599,9 +1854,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_08 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_08", resourceCulture);
@@ -2609,9 +1861,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_08_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_08_blue", resourceCulture);
@@ -2619,9 +1868,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_08_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_08_green", resourceCulture);
@@ -2629,9 +1875,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_08_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_08_green_blue", resourceCulture);
@@ -2639,9 +1882,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_09 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_09", resourceCulture);
@@ -2649,9 +1889,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_09_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_09_blue", resourceCulture);
@@ -2659,9 +1896,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_09_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_09_green", resourceCulture);
@@ -2669,9 +1903,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_09_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_09_green_blue", resourceCulture);
@@ -2679,9 +1910,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_10 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_10", resourceCulture);
@@ -2689,9 +1917,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_10_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_10_blue", resourceCulture);
@@ -2699,9 +1924,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_10_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_10_green", resourceCulture);
@@ -2709,9 +1931,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_10_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_10_green_blue", resourceCulture);
@@ -2719,9 +1938,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_11 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_11", resourceCulture);
@@ -2729,9 +1945,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_11_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_11_blue", resourceCulture);
@@ -2739,9 +1952,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_11_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_11_green", resourceCulture);
@@ -2749,9 +1959,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_11_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_11_green_blue", resourceCulture);
@@ -2759,9 +1966,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_12 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_12", resourceCulture);
@@ -2769,9 +1973,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_12_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_12_blue", resourceCulture);
@@ -2779,9 +1980,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_12_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_12_green", resourceCulture);
@@ -2789,9 +1987,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_12_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_12_green_blue", resourceCulture);
@@ -2799,9 +1994,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_13 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_13", resourceCulture);
@@ -2809,9 +2001,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_13_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_13_blue", resourceCulture);
@@ -2819,9 +2008,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_13_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_13_green", resourceCulture);
@@ -2829,9 +2015,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_13_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_13_green_blue", resourceCulture);
@@ -2839,9 +2022,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_14 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_14", resourceCulture);
@@ -2849,9 +2029,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_14_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_14_blue", resourceCulture);
@@ -2859,9 +2036,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_14_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_14_green", resourceCulture);
@@ -2869,9 +2043,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_14_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_14_green_blue", resourceCulture);
@@ -2879,9 +2050,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_15 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_15", resourceCulture);
@@ -2889,9 +2057,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_15_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_15_blue", resourceCulture);
@@ -2899,9 +2064,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_15_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_15_green", resourceCulture);
@@ -2909,9 +2071,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_15_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_15_green_blue", resourceCulture);
@@ -2919,9 +2078,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_16 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_16", resourceCulture);
@@ -2929,9 +2085,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_16_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_16_blue", resourceCulture);
@@ -2939,9 +2092,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_16_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_16_green", resourceCulture);
@@ -2949,9 +2099,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_16_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_16_green_blue", resourceCulture);
@@ -2959,9 +2106,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_17 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_17", resourceCulture);
@@ -2969,9 +2113,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_17_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_17_blue", resourceCulture);
@@ -2979,9 +2120,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_17_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_17_green", resourceCulture);
@@ -2989,9 +2127,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_17_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_17_green_blue", resourceCulture);
@@ -2999,9 +2134,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_18 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_18", resourceCulture);
@@ -3009,9 +2141,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_18_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_18_blue", resourceCulture);
@@ -3019,9 +2148,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_18_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_18_green", resourceCulture);
@@ -3029,9 +2155,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_18_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_18_green_blue", resourceCulture);
@@ -3039,9 +2162,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_19 {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_19", resourceCulture);
@@ -3049,9 +2169,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_19_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_19_blue", resourceCulture);
@@ -3059,9 +2176,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_19_green {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_19_green", resourceCulture);
@@ -3069,9 +2183,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ts_v_piano_19_green_blue {
             get {
                 object obj = ResourceManager.GetObject("ts_v_piano_19_green_blue", resourceCulture);
@@ -3079,9 +2190,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap TurboFastForward {
             get {
                 object obj = ResourceManager.GetObject("TurboFastForward", resourceCulture);
@@ -3089,9 +2197,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap tvIcon {
             get {
                 object obj = ResourceManager.GetObject("tvIcon", resourceCulture);
@@ -3099,9 +2204,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap undo {
             get {
                 object obj = ResourceManager.GetObject("undo", resourceCulture);
@@ -3109,9 +2211,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Unfreeze {
             get {
                 object obj = ResourceManager.GetObject("Unfreeze", resourceCulture);
@@ -3119,9 +2218,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
-        /// </summary>
         internal static System.Drawing.Icon user_blue {
             get {
                 object obj = ResourceManager.GetObject("user_blue", resourceCulture);
@@ -3129,9 +2225,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap user_blue_small {
             get {
                 object obj = ResourceManager.GetObject("user_blue_small", resourceCulture);
@@ -3139,9 +2232,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap WarningHS {
             get {
                 object obj = ResourceManager.GetObject("WarningHS", resourceCulture);
@@ -3149,9 +2239,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap watch {
             get {
                 object obj = ResourceManager.GetObject("watch", resourceCulture);
@@ -3159,9 +2246,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap whiteTriDown {
             get {
                 object obj = ResourceManager.GetObject("whiteTriDown", resourceCulture);
@@ -3169,9 +2253,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap whiteTriLeft {
             get {
                 object obj = ResourceManager.GetObject("whiteTriLeft", resourceCulture);
@@ -3179,9 +2260,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap whiteTriRight {
             get {
                 object obj = ResourceManager.GetObject("whiteTriRight", resourceCulture);
@@ -3189,9 +2267,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap whiteTriUp {
             get {
                 object obj = ResourceManager.GetObject("whiteTriUp", resourceCulture);
@@ -3199,9 +2274,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap WonderSwanColor {
             get {
                 object obj = ResourceManager.GetObject("WonderSwanColor", resourceCulture);
@@ -3209,9 +2281,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap yabause {
             get {
                 object obj = ResourceManager.GetObject("yabause", resourceCulture);
@@ -3219,9 +2288,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap YellowDown {
             get {
                 object obj = ResourceManager.GetObject("YellowDown", resourceCulture);
@@ -3229,9 +2295,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap YellowLeft {
             get {
                 object obj = ResourceManager.GetObject("YellowLeft", resourceCulture);
@@ -3239,9 +2302,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap YellowRight {
             get {
                 object obj = ResourceManager.GetObject("YellowRight", resourceCulture);
@@ -3249,9 +2309,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap YellowUp {
             get {
                 object obj = ResourceManager.GetObject("YellowUp", resourceCulture);
diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx
index 6ec5250aef..a705417ea3 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.resx
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx
@@ -1503,4 +1503,10 @@
   <data name="kitchensink" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\kitchensink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icon_anchor_lag" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\tastudio\icon_anchor_lag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icon_marker" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\tastudio\icon_marker.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/images/tastudio/anchor.png b/BizHawk.Client.EmuHawk/images/tastudio/anchor.png
deleted file mode 100644
index 614eaffbef..0000000000
Binary files a/BizHawk.Client.EmuHawk/images/tastudio/anchor.png and /dev/null differ
diff --git a/BizHawk.Client.EmuHawk/images/tastudio/icon_anchor.png b/BizHawk.Client.EmuHawk/images/tastudio/icon_anchor.png
new file mode 100644
index 0000000000..e0151ac14d
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/tastudio/icon_anchor.png differ
diff --git a/BizHawk.Client.EmuHawk/images/tastudio/icon_anchor_lag.png b/BizHawk.Client.EmuHawk/images/tastudio/icon_anchor_lag.png
new file mode 100644
index 0000000000..a1f32b6139
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/tastudio/icon_anchor_lag.png differ
diff --git a/BizHawk.Client.EmuHawk/images/tastudio/icon_marker.png b/BizHawk.Client.EmuHawk/images/tastudio/icon_marker.png
new file mode 100644
index 0000000000..8ddcb829ab
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/tastudio/icon_marker.png differ
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs
index 58f4b9da1c..e51b86c45a 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs
@@ -58,6 +58,11 @@ namespace BizHawk.Client.EmuHawk
 		public bool HideWasLagFrames { get; set; }
 		private byte[] lagFrames = new byte[100]; // Large enough value that it shouldn't ever need resizing.
 
+        public bool denoteStatesWithIcons { get; set; }
+        public bool denoteStatesWithBGColor { get; set; }
+        public bool denoteMarkersWithIcons { get; set; }
+        public bool denoteMarkersWithBGColor { get; set; }
+
 		private IntPtr RotatedFont;
 		private Font NormalFont;
 
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
index d6df2e388e..6e237ca9b5 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
@@ -30,172 +30,177 @@ namespace BizHawk.Client.EmuHawk
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.components = new System.ComponentModel.Container();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TAStudio));
-			this.TASMenu = new MenuStripEx();
-			this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.NewTASMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.OpenTASMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.SaveTASMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.SaveAsTASMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.RecentSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-			this.saveSelectionToMacroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.placeMacroAtSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.recentMacrosToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
-			this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
-			this.ToBk2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-			this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.EditSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.UndoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.RedoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.showUndoHistoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.SelectionUndoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.SelectionRedoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
-			this.DeselectMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.SelectAllMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.SelectBetweenMarkersMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.ReselectClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
-			this.CopyMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.PasteMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.PasteInsertMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.CutMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
-			this.ClearMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.DeleteFramesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.CloneMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.InsertFrameMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.InsertNumFramesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
-			this.TruncateMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.ClearGreenzoneMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.GreenzoneICheckSeparator = new System.Windows.Forms.ToolStripSeparator();
-			this.StateHistoryIntegrityCheckMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.ConfigSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.SetMaxUndoLevelsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
-			this.AutoadjustInputMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
-			this.DrawInputByDraggingMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.applyPatternToPaintedInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.onlyOnAutoFireColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.UseInputKeysItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-			this.BindMarkersToInputMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.EmptyNewMarkerNotesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
-			this.BranchesRestoreEntireMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.OsdInBranchScreenshotsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
-			this.AutopauseAtEndOfMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.sepToolStripMenuItem = new System.Windows.Forms.ToolStripSeparator();
-			this.autoHoldFireToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.keepSetPatternsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.sepToolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
-			this.autoHoldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.autoFireToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.customPatternToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.setpToolStripMenuItem = new System.Windows.Forms.ToolStripSeparator();
-			this.setCustomsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.MetaSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.HeaderMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.StateHistorySettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.CommentsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.SubtitlesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator();
-			this.DefaultStateSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.SettingsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.RotateMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.HideLagFramesSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.HideLagFrames0 = new System.Windows.Forms.ToolStripMenuItem();
-			this.HideLagFrames1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.HideLagFrames2 = new System.Windows.Forms.ToolStripMenuItem();
-			this.HideLagFrames3 = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
-			this.hideWasLagFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator();
-			this.followCursorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.alwaysScrollToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator24 = new System.Windows.Forms.ToolStripSeparator();
-			this.scrollToViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.scrollToTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.scrollToBottomToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.scrollToCenterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator();
-			this.wheelScrollSpeedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.ColumnsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator();
-			this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.EnableTooltipsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
-			this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.TasView = new BizHawk.Client.EmuHawk.InputRoll();
-			this.TasStatusStrip = new StatusStripEx();
-			this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
-			this.SavingProgressBar = new System.Windows.Forms.ToolStripProgressBar();
-			this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.SplicerStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
-			this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox();
-			this.MarkerControl = new BizHawk.Client.EmuHawk.MarkerControl();
-			this.MarkerContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-			this.ScrollToMarkerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.EditMarkerContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.AddMarkerContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.RemoveMarkerContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.RightClickMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-			this.SetMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.RemoveMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
-			this.DeselectContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.SelectBetweenMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
-			this.UngreenzoneContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.CancelSeekContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
-			this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.pasteInsertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.separateToolStripMenuItem = new System.Windows.Forms.ToolStripSeparator();
-			this.ClearContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.DeleteFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.CloneContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.InsertFrameContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.InsertNumFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator();
-			this.TruncateContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.BranchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.StartFromNowSeparator = new System.Windows.Forms.ToolStripSeparator();
-			this.StartNewProjectFromNowMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.StartANewProjectFromSaveRamMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.BookMarkControl = new BizHawk.Client.EmuHawk.BookmarksBranchesBox();
-			this.BranchesMarkersSplit = new System.Windows.Forms.SplitContainer();
-			this.MainVertialSplit = new System.Windows.Forms.SplitContainer();
-			this.TASMenu.SuspendLayout();
-			this.TasStatusStrip.SuspendLayout();
-			this.MarkerContextMenu.SuspendLayout();
-			this.RightClickMenu.SuspendLayout();
-			this.groupBox1.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.BranchesMarkersSplit)).BeginInit();
-			this.BranchesMarkersSplit.Panel1.SuspendLayout();
-			this.BranchesMarkersSplit.Panel2.SuspendLayout();
-			this.BranchesMarkersSplit.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.MainVertialSplit)).BeginInit();
-			this.MainVertialSplit.Panel1.SuspendLayout();
-			this.MainVertialSplit.Panel2.SuspendLayout();
-			this.MainVertialSplit.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// TASMenu
-			// 
-			this.TASMenu.ClickThrough = true;
-			this.TASMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TAStudio));
+            this.TASMenu = new MenuStripEx();
+            this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+            this.NewTASMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.OpenTASMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.SaveTASMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.SaveAsTASMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.RecentSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.saveSelectionToMacroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.placeMacroAtSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.recentMacrosToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
+            this.ToBk2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.EditSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+            this.UndoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.RedoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.showUndoHistoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.SelectionUndoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.SelectionRedoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+            this.DeselectMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.SelectAllMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.SelectBetweenMarkersMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ReselectClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+            this.CopyMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.PasteMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.PasteInsertMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.CutMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+            this.ClearMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.DeleteFramesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.CloneMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.InsertFrameMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.InsertNumFramesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+            this.TruncateMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ClearGreenzoneMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.GreenzoneICheckSeparator = new System.Windows.Forms.ToolStripSeparator();
+            this.StateHistoryIntegrityCheckMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ConfigSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+            this.SetMaxUndoLevelsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+            this.AutoadjustInputMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
+            this.DrawInputByDraggingMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.applyPatternToPaintedInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.onlyOnAutoFireColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.UseInputKeysItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+            this.BindMarkersToInputMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.EmptyNewMarkerNotesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
+            this.BranchesRestoreEntireMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.OsdInBranchScreenshotsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
+            this.AutopauseAtEndOfMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.sepToolStripMenuItem = new System.Windows.Forms.ToolStripSeparator();
+            this.autoHoldFireToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.keepSetPatternsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.sepToolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
+            this.autoHoldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.autoFireToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.customPatternToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.setpToolStripMenuItem = new System.Windows.Forms.ToolStripSeparator();
+            this.setCustomsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.MetaSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+            this.HeaderMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.StateHistorySettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.CommentsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.SubtitlesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator();
+            this.DefaultStateSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.SettingsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+            this.RotateMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.HideLagFramesSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+            this.HideLagFrames0 = new System.Windows.Forms.ToolStripMenuItem();
+            this.HideLagFrames1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.HideLagFrames2 = new System.Windows.Forms.ToolStripMenuItem();
+            this.HideLagFrames3 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
+            this.hideWasLagFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator();
+            this.followCursorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.alwaysScrollToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator24 = new System.Windows.Forms.ToolStripSeparator();
+            this.scrollToViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.scrollToTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.scrollToBottomToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.scrollToCenterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator();
+            this.wheelScrollSpeedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ColumnsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator();
+            this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+            this.EnableTooltipsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
+            this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.TasView = new BizHawk.Client.EmuHawk.InputRoll();
+            this.TasStatusStrip = new StatusStripEx();
+            this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
+            this.SavingProgressBar = new System.Windows.Forms.ToolStripProgressBar();
+            this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.SplicerStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
+            this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox();
+            this.MarkerControl = new BizHawk.Client.EmuHawk.MarkerControl();
+            this.MarkerContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.ScrollToMarkerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.EditMarkerContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.AddMarkerContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.RemoveMarkerContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.RightClickMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.SetMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.RemoveMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
+            this.DeselectContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.SelectBetweenMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
+            this.UngreenzoneContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.CancelSeekContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
+            this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.pasteInsertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.separateToolStripMenuItem = new System.Windows.Forms.ToolStripSeparator();
+            this.ClearContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.DeleteFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.CloneContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.InsertFrameContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.InsertNumFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator();
+            this.TruncateContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.BranchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.StartFromNowSeparator = new System.Windows.Forms.ToolStripSeparator();
+            this.StartNewProjectFromNowMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.StartANewProjectFromSaveRamMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.BookMarkControl = new BizHawk.Client.EmuHawk.BookmarksBranchesBox();
+            this.BranchesMarkersSplit = new System.Windows.Forms.SplitContainer();
+            this.MainVertialSplit = new System.Windows.Forms.SplitContainer();
+            this.iconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.denoteStatesWithIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.denoteStatesWithBGColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.denoteMarkersWithIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.denoteMarkersWithBGColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.TASMenu.SuspendLayout();
+            this.TasStatusStrip.SuspendLayout();
+            this.MarkerContextMenu.SuspendLayout();
+            this.RightClickMenu.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.BranchesMarkersSplit)).BeginInit();
+            this.BranchesMarkersSplit.Panel1.SuspendLayout();
+            this.BranchesMarkersSplit.Panel2.SuspendLayout();
+            this.BranchesMarkersSplit.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.MainVertialSplit)).BeginInit();
+            this.MainVertialSplit.Panel1.SuspendLayout();
+            this.MainVertialSplit.Panel2.SuspendLayout();
+            this.MainVertialSplit.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // TASMenu
+            // 
+            this.TASMenu.ClickThrough = true;
+            this.TASMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.FileSubMenu,
             this.EditSubMenu,
             this.ConfigSubMenu,
@@ -203,15 +208,15 @@ namespace BizHawk.Client.EmuHawk
             this.SettingsSubMenu,
             this.ColumnsSubMenu,
             this.HelpSubMenu});
-			this.TASMenu.Location = new System.Drawing.Point(0, 0);
-			this.TASMenu.Name = "TASMenu";
-			this.TASMenu.Size = new System.Drawing.Size(509, 24);
-			this.TASMenu.TabIndex = 0;
-			this.TASMenu.Text = "menuStrip1";
-			// 
-			// FileSubMenu
-			// 
-			this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.TASMenu.Location = new System.Drawing.Point(0, 0);
+            this.TASMenu.Name = "TASMenu";
+            this.TASMenu.Size = new System.Drawing.Size(509, 24);
+            this.TASMenu.TabIndex = 0;
+            this.TASMenu.Text = "menuStrip1";
+            // 
+            // FileSubMenu
+            // 
+            this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.NewTASMenuItem,
             this.OpenTASMenuItem,
             this.SaveTASMenuItem,
@@ -225,121 +230,121 @@ namespace BizHawk.Client.EmuHawk
             this.ToBk2MenuItem,
             this.toolStripSeparator2,
             this.ExitMenuItem});
-			this.FileSubMenu.Name = "FileSubMenu";
-			this.FileSubMenu.Size = new System.Drawing.Size(37, 20);
-			this.FileSubMenu.Text = "&File";
-			this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened);
-			// 
-			// NewTASMenuItem
-			// 
-			this.NewTASMenuItem.Name = "NewTASMenuItem";
-			this.NewTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
-			this.NewTASMenuItem.Size = new System.Drawing.Size(203, 22);
-			this.NewTASMenuItem.Text = "&New";
-			this.NewTASMenuItem.Click += new System.EventHandler(this.NewTasMenuItem_Click);
-			// 
-			// OpenTASMenuItem
-			// 
-			this.OpenTASMenuItem.Name = "OpenTASMenuItem";
-			this.OpenTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
-			this.OpenTASMenuItem.Size = new System.Drawing.Size(203, 22);
-			this.OpenTASMenuItem.Text = "&Open";
-			this.OpenTASMenuItem.Click += new System.EventHandler(this.OpenTasMenuItem_Click);
-			// 
-			// SaveTASMenuItem
-			// 
-			this.SaveTASMenuItem.Name = "SaveTASMenuItem";
-			this.SaveTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
-			this.SaveTASMenuItem.Size = new System.Drawing.Size(203, 22);
-			this.SaveTASMenuItem.Text = "&Save";
-			this.SaveTASMenuItem.Click += new System.EventHandler(this.SaveTasMenuItem_Click);
-			// 
-			// SaveAsTASMenuItem
-			// 
-			this.SaveAsTASMenuItem.Name = "SaveAsTASMenuItem";
-			this.SaveAsTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
-            | System.Windows.Forms.Keys.S)));
-			this.SaveAsTASMenuItem.Size = new System.Drawing.Size(203, 22);
-			this.SaveAsTASMenuItem.Text = "Save As";
-			this.SaveAsTASMenuItem.Click += new System.EventHandler(this.SaveAsTasMenuItem_Click);
-			// 
-			// RecentSubMenu
-			// 
-			this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.FileSubMenu.Name = "FileSubMenu";
+            this.FileSubMenu.Size = new System.Drawing.Size(35, 20);
+            this.FileSubMenu.Text = "&File";
+            this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened);
+            // 
+            // NewTASMenuItem
+            // 
+            this.NewTASMenuItem.Name = "NewTASMenuItem";
+            this.NewTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
+            this.NewTASMenuItem.Size = new System.Drawing.Size(201, 22);
+            this.NewTASMenuItem.Text = "&New";
+            this.NewTASMenuItem.Click += new System.EventHandler(this.NewTasMenuItem_Click);
+            // 
+            // OpenTASMenuItem
+            // 
+            this.OpenTASMenuItem.Name = "OpenTASMenuItem";
+            this.OpenTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
+            this.OpenTASMenuItem.Size = new System.Drawing.Size(201, 22);
+            this.OpenTASMenuItem.Text = "&Open";
+            this.OpenTASMenuItem.Click += new System.EventHandler(this.OpenTasMenuItem_Click);
+            // 
+            // SaveTASMenuItem
+            // 
+            this.SaveTASMenuItem.Name = "SaveTASMenuItem";
+            this.SaveTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
+            this.SaveTASMenuItem.Size = new System.Drawing.Size(201, 22);
+            this.SaveTASMenuItem.Text = "&Save";
+            this.SaveTASMenuItem.Click += new System.EventHandler(this.SaveTasMenuItem_Click);
+            // 
+            // SaveAsTASMenuItem
+            // 
+            this.SaveAsTASMenuItem.Name = "SaveAsTASMenuItem";
+            this.SaveAsTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
+                        | System.Windows.Forms.Keys.S)));
+            this.SaveAsTASMenuItem.Size = new System.Drawing.Size(201, 22);
+            this.SaveAsTASMenuItem.Text = "Save As";
+            this.SaveAsTASMenuItem.Click += new System.EventHandler(this.SaveAsTasMenuItem_Click);
+            // 
+            // RecentSubMenu
+            // 
+            this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripSeparator3});
-			this.RecentSubMenu.Image = ((System.Drawing.Image)(resources.GetObject("RecentSubMenu.Image")));
-			this.RecentSubMenu.Name = "RecentSubMenu";
-			this.RecentSubMenu.Size = new System.Drawing.Size(203, 22);
-			this.RecentSubMenu.Text = "Recent";
-			this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened);
-			// 
-			// toolStripSeparator3
-			// 
-			this.toolStripSeparator3.Name = "toolStripSeparator3";
-			this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6);
-			// 
-			// toolStripSeparator1
-			// 
-			this.toolStripSeparator1.Name = "toolStripSeparator1";
-			this.toolStripSeparator1.Size = new System.Drawing.Size(200, 6);
-			// 
-			// saveSelectionToMacroToolStripMenuItem
-			// 
-			this.saveSelectionToMacroToolStripMenuItem.Name = "saveSelectionToMacroToolStripMenuItem";
-			this.saveSelectionToMacroToolStripMenuItem.Size = new System.Drawing.Size(203, 22);
-			this.saveSelectionToMacroToolStripMenuItem.Text = "Save Selection to Macro";
-			this.saveSelectionToMacroToolStripMenuItem.Click += new System.EventHandler(this.saveSelectionToMacroToolStripMenuItem_Click);
-			// 
-			// placeMacroAtSelectionToolStripMenuItem
-			// 
-			this.placeMacroAtSelectionToolStripMenuItem.Name = "placeMacroAtSelectionToolStripMenuItem";
-			this.placeMacroAtSelectionToolStripMenuItem.Size = new System.Drawing.Size(203, 22);
-			this.placeMacroAtSelectionToolStripMenuItem.Text = "Place Macro at Selection";
-			this.placeMacroAtSelectionToolStripMenuItem.Click += new System.EventHandler(this.placeMacroAtSelectionToolStripMenuItem_Click);
-			// 
-			// recentMacrosToolStripMenuItem
-			// 
-			this.recentMacrosToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.RecentSubMenu.Image = ((System.Drawing.Image)(resources.GetObject("RecentSubMenu.Image")));
+            this.RecentSubMenu.Name = "RecentSubMenu";
+            this.RecentSubMenu.Size = new System.Drawing.Size(201, 22);
+            this.RecentSubMenu.Text = "Recent";
+            this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened);
+            // 
+            // toolStripSeparator3
+            // 
+            this.toolStripSeparator3.Name = "toolStripSeparator3";
+            this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(198, 6);
+            // 
+            // saveSelectionToMacroToolStripMenuItem
+            // 
+            this.saveSelectionToMacroToolStripMenuItem.Name = "saveSelectionToMacroToolStripMenuItem";
+            this.saveSelectionToMacroToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
+            this.saveSelectionToMacroToolStripMenuItem.Text = "Save Selection to Macro";
+            this.saveSelectionToMacroToolStripMenuItem.Click += new System.EventHandler(this.saveSelectionToMacroToolStripMenuItem_Click);
+            // 
+            // placeMacroAtSelectionToolStripMenuItem
+            // 
+            this.placeMacroAtSelectionToolStripMenuItem.Name = "placeMacroAtSelectionToolStripMenuItem";
+            this.placeMacroAtSelectionToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
+            this.placeMacroAtSelectionToolStripMenuItem.Text = "Place Macro at Selection";
+            this.placeMacroAtSelectionToolStripMenuItem.Click += new System.EventHandler(this.placeMacroAtSelectionToolStripMenuItem_Click);
+            // 
+            // recentMacrosToolStripMenuItem
+            // 
+            this.recentMacrosToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripSeparator22});
-			this.recentMacrosToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
-			this.recentMacrosToolStripMenuItem.Name = "recentMacrosToolStripMenuItem";
-			this.recentMacrosToolStripMenuItem.Size = new System.Drawing.Size(203, 22);
-			this.recentMacrosToolStripMenuItem.Text = "Recent Macros";
-			this.recentMacrosToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentMacrosToolStripMenuItem_DropDownOpened);
-			// 
-			// toolStripSeparator22
-			// 
-			this.toolStripSeparator22.Name = "toolStripSeparator22";
-			this.toolStripSeparator22.Size = new System.Drawing.Size(57, 6);
-			// 
-			// toolStripSeparator20
-			// 
-			this.toolStripSeparator20.Name = "toolStripSeparator20";
-			this.toolStripSeparator20.Size = new System.Drawing.Size(200, 6);
-			// 
-			// ToBk2MenuItem
-			// 
-			this.ToBk2MenuItem.Name = "ToBk2MenuItem";
-			this.ToBk2MenuItem.Size = new System.Drawing.Size(203, 22);
-			this.ToBk2MenuItem.Text = "&Export to Bk2";
-			this.ToBk2MenuItem.Click += new System.EventHandler(this.ToBk2MenuItem_Click);
-			// 
-			// toolStripSeparator2
-			// 
-			this.toolStripSeparator2.Name = "toolStripSeparator2";
-			this.toolStripSeparator2.Size = new System.Drawing.Size(200, 6);
-			// 
-			// ExitMenuItem
-			// 
-			this.ExitMenuItem.Name = "ExitMenuItem";
-			this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
-			this.ExitMenuItem.Size = new System.Drawing.Size(203, 22);
-			this.ExitMenuItem.Text = "E&xit";
-			this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click);
-			// 
-			// EditSubMenu
-			// 
-			this.EditSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.recentMacrosToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
+            this.recentMacrosToolStripMenuItem.Name = "recentMacrosToolStripMenuItem";
+            this.recentMacrosToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
+            this.recentMacrosToolStripMenuItem.Text = "Recent Macros";
+            this.recentMacrosToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentMacrosToolStripMenuItem_DropDownOpened);
+            // 
+            // toolStripSeparator22
+            // 
+            this.toolStripSeparator22.Name = "toolStripSeparator22";
+            this.toolStripSeparator22.Size = new System.Drawing.Size(57, 6);
+            // 
+            // toolStripSeparator20
+            // 
+            this.toolStripSeparator20.Name = "toolStripSeparator20";
+            this.toolStripSeparator20.Size = new System.Drawing.Size(198, 6);
+            // 
+            // ToBk2MenuItem
+            // 
+            this.ToBk2MenuItem.Name = "ToBk2MenuItem";
+            this.ToBk2MenuItem.Size = new System.Drawing.Size(201, 22);
+            this.ToBk2MenuItem.Text = "&Export to Bk2";
+            this.ToBk2MenuItem.Click += new System.EventHandler(this.ToBk2MenuItem_Click);
+            // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(198, 6);
+            // 
+            // ExitMenuItem
+            // 
+            this.ExitMenuItem.Name = "ExitMenuItem";
+            this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
+            this.ExitMenuItem.Size = new System.Drawing.Size(201, 22);
+            this.ExitMenuItem.Text = "E&xit";
+            this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click);
+            // 
+            // EditSubMenu
+            // 
+            this.EditSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.UndoMenuItem,
             this.RedoMenuItem,
             this.showUndoHistoryToolStripMenuItem,
@@ -366,211 +371,211 @@ namespace BizHawk.Client.EmuHawk
             this.ClearGreenzoneMenuItem,
             this.GreenzoneICheckSeparator,
             this.StateHistoryIntegrityCheckMenuItem});
-			this.EditSubMenu.Name = "EditSubMenu";
-			this.EditSubMenu.Size = new System.Drawing.Size(39, 20);
-			this.EditSubMenu.Text = "&Edit";
-			this.EditSubMenu.DropDownOpened += new System.EventHandler(this.EditSubMenu_DropDownOpened);
-			// 
-			// UndoMenuItem
-			// 
-			this.UndoMenuItem.Name = "UndoMenuItem";
-			this.UndoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z)));
-			this.UndoMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.UndoMenuItem.Text = "&Undo";
-			this.UndoMenuItem.Click += new System.EventHandler(this.UndoMenuItem_Click);
-			// 
-			// RedoMenuItem
-			// 
-			this.RedoMenuItem.Enabled = false;
-			this.RedoMenuItem.Name = "RedoMenuItem";
-			this.RedoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y)));
-			this.RedoMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.RedoMenuItem.Text = "&Redo";
-			this.RedoMenuItem.Click += new System.EventHandler(this.RedoMenuItem_Click);
-			// 
-			// showUndoHistoryToolStripMenuItem
-			// 
-			this.showUndoHistoryToolStripMenuItem.Name = "showUndoHistoryToolStripMenuItem";
-			this.showUndoHistoryToolStripMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.showUndoHistoryToolStripMenuItem.Text = "Show Undo History";
-			this.showUndoHistoryToolStripMenuItem.Click += new System.EventHandler(this.showUndoHistoryToolStripMenuItem_Click);
-			// 
-			// SelectionUndoMenuItem
-			// 
-			this.SelectionUndoMenuItem.Enabled = false;
-			this.SelectionUndoMenuItem.Name = "SelectionUndoMenuItem";
-			this.SelectionUndoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));
-			this.SelectionUndoMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.SelectionUndoMenuItem.Text = "Selection Undo";
-			// 
-			// SelectionRedoMenuItem
-			// 
-			this.SelectionRedoMenuItem.Enabled = false;
-			this.SelectionRedoMenuItem.Name = "SelectionRedoMenuItem";
-			this.SelectionRedoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
-			this.SelectionRedoMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.SelectionRedoMenuItem.Text = "Selection Redo";
-			// 
-			// toolStripSeparator5
-			// 
-			this.toolStripSeparator5.Name = "toolStripSeparator5";
-			this.toolStripSeparator5.Size = new System.Drawing.Size(290, 6);
-			// 
-			// DeselectMenuItem
-			// 
-			this.DeselectMenuItem.Name = "DeselectMenuItem";
-			this.DeselectMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.DeselectMenuItem.Text = "Deselect";
-			this.DeselectMenuItem.Click += new System.EventHandler(this.DeselectMenuItem_Click);
-			// 
-			// SelectAllMenuItem
-			// 
-			this.SelectAllMenuItem.Name = "SelectAllMenuItem";
-			this.SelectAllMenuItem.ShortcutKeyDisplayString = "";
-			this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
-			this.SelectAllMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.SelectAllMenuItem.Text = "Select &All";
-			this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click);
-			// 
-			// SelectBetweenMarkersMenuItem
-			// 
-			this.SelectBetweenMarkersMenuItem.Name = "SelectBetweenMarkersMenuItem";
-			this.SelectBetweenMarkersMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
-            | System.Windows.Forms.Keys.A)));
-			this.SelectBetweenMarkersMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.SelectBetweenMarkersMenuItem.Text = "Select between Markers";
-			this.SelectBetweenMarkersMenuItem.Click += new System.EventHandler(this.SelectBetweenMarkersMenuItem_Click);
-			// 
-			// ReselectClipboardMenuItem
-			// 
-			this.ReselectClipboardMenuItem.Name = "ReselectClipboardMenuItem";
-			this.ReselectClipboardMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B)));
-			this.ReselectClipboardMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.ReselectClipboardMenuItem.Text = "Reselect Clipboard";
-			this.ReselectClipboardMenuItem.Click += new System.EventHandler(this.ReselectClipboardMenuItem_Click);
-			// 
-			// toolStripSeparator7
-			// 
-			this.toolStripSeparator7.Name = "toolStripSeparator7";
-			this.toolStripSeparator7.Size = new System.Drawing.Size(290, 6);
-			// 
-			// CopyMenuItem
-			// 
-			this.CopyMenuItem.Name = "CopyMenuItem";
-			this.CopyMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
-			this.CopyMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.CopyMenuItem.Text = "Copy";
-			this.CopyMenuItem.Click += new System.EventHandler(this.CopyMenuItem_Click);
-			// 
-			// PasteMenuItem
-			// 
-			this.PasteMenuItem.Name = "PasteMenuItem";
-			this.PasteMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
-			this.PasteMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.PasteMenuItem.Text = "&Paste";
-			this.PasteMenuItem.Click += new System.EventHandler(this.PasteMenuItem_Click);
-			// 
-			// PasteInsertMenuItem
-			// 
-			this.PasteInsertMenuItem.Name = "PasteInsertMenuItem";
-			this.PasteInsertMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
-            | System.Windows.Forms.Keys.V)));
-			this.PasteInsertMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.PasteInsertMenuItem.Text = "&Paste Insert";
-			this.PasteInsertMenuItem.Click += new System.EventHandler(this.PasteInsertMenuItem_Click);
-			// 
-			// CutMenuItem
-			// 
-			this.CutMenuItem.Name = "CutMenuItem";
-			this.CutMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X)));
-			this.CutMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.CutMenuItem.Text = "&Cut";
-			this.CutMenuItem.Click += new System.EventHandler(this.CutMenuItem_Click);
-			// 
-			// toolStripSeparator8
-			// 
-			this.toolStripSeparator8.Name = "toolStripSeparator8";
-			this.toolStripSeparator8.Size = new System.Drawing.Size(290, 6);
-			// 
-			// ClearMenuItem
-			// 
-			this.ClearMenuItem.Name = "ClearMenuItem";
-			this.ClearMenuItem.ShortcutKeyDisplayString = "";
-			this.ClearMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete)));
-			this.ClearMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.ClearMenuItem.Text = "Clear";
-			this.ClearMenuItem.Click += new System.EventHandler(this.ClearMenuItem_Click);
-			// 
-			// DeleteFramesMenuItem
-			// 
-			this.DeleteFramesMenuItem.Name = "DeleteFramesMenuItem";
-			this.DeleteFramesMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete;
-			this.DeleteFramesMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.DeleteFramesMenuItem.Text = "&Delete";
-			this.DeleteFramesMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click);
-			// 
-			// CloneMenuItem
-			// 
-			this.CloneMenuItem.Name = "CloneMenuItem";
-			this.CloneMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert)));
-			this.CloneMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.CloneMenuItem.Text = "&Clone";
-			this.CloneMenuItem.Click += new System.EventHandler(this.CloneMenuItem_Click);
-			// 
-			// InsertFrameMenuItem
-			// 
-			this.InsertFrameMenuItem.Name = "InsertFrameMenuItem";
-			this.InsertFrameMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
-            | System.Windows.Forms.Keys.Insert)));
-			this.InsertFrameMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.InsertFrameMenuItem.Text = "&Insert";
-			this.InsertFrameMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click);
-			// 
-			// InsertNumFramesMenuItem
-			// 
-			this.InsertNumFramesMenuItem.Name = "InsertNumFramesMenuItem";
-			this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = "";
-			this.InsertNumFramesMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Insert;
-			this.InsertNumFramesMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.InsertNumFramesMenuItem.Text = "Insert # of Frames";
-			this.InsertNumFramesMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click);
-			// 
-			// toolStripSeparator6
-			// 
-			this.toolStripSeparator6.Name = "toolStripSeparator6";
-			this.toolStripSeparator6.Size = new System.Drawing.Size(290, 6);
-			// 
-			// TruncateMenuItem
-			// 
-			this.TruncateMenuItem.Name = "TruncateMenuItem";
-			this.TruncateMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.TruncateMenuItem.Text = "&Truncate Movie";
-			this.TruncateMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click);
-			// 
-			// ClearGreenzoneMenuItem
-			// 
-			this.ClearGreenzoneMenuItem.Name = "ClearGreenzoneMenuItem";
-			this.ClearGreenzoneMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.ClearGreenzoneMenuItem.Text = "&Clear Savestate History";
-			this.ClearGreenzoneMenuItem.Click += new System.EventHandler(this.ClearGreenzoneMenuItem_Click);
-			// 
-			// GreenzoneICheckSeparator
-			// 
-			this.GreenzoneICheckSeparator.Name = "GreenzoneICheckSeparator";
-			this.GreenzoneICheckSeparator.Size = new System.Drawing.Size(290, 6);
-			// 
-			// StateHistoryIntegrityCheckMenuItem
-			// 
-			this.StateHistoryIntegrityCheckMenuItem.Name = "StateHistoryIntegrityCheckMenuItem";
-			this.StateHistoryIntegrityCheckMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
-            | System.Windows.Forms.Keys.I)));
-			this.StateHistoryIntegrityCheckMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.StateHistoryIntegrityCheckMenuItem.Text = "State History Integrity Check";
-			this.StateHistoryIntegrityCheckMenuItem.Click += new System.EventHandler(this.StateHistoryIntegrityCheckMenuItem_Click);
-			// 
-			// ConfigSubMenu
-			// 
-			this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.EditSubMenu.Name = "EditSubMenu";
+            this.EditSubMenu.Size = new System.Drawing.Size(37, 20);
+            this.EditSubMenu.Text = "&Edit";
+            this.EditSubMenu.DropDownOpened += new System.EventHandler(this.EditSubMenu_DropDownOpened);
+            // 
+            // UndoMenuItem
+            // 
+            this.UndoMenuItem.Name = "UndoMenuItem";
+            this.UndoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z)));
+            this.UndoMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.UndoMenuItem.Text = "&Undo";
+            this.UndoMenuItem.Click += new System.EventHandler(this.UndoMenuItem_Click);
+            // 
+            // RedoMenuItem
+            // 
+            this.RedoMenuItem.Enabled = false;
+            this.RedoMenuItem.Name = "RedoMenuItem";
+            this.RedoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y)));
+            this.RedoMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.RedoMenuItem.Text = "&Redo";
+            this.RedoMenuItem.Click += new System.EventHandler(this.RedoMenuItem_Click);
+            // 
+            // showUndoHistoryToolStripMenuItem
+            // 
+            this.showUndoHistoryToolStripMenuItem.Name = "showUndoHistoryToolStripMenuItem";
+            this.showUndoHistoryToolStripMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.showUndoHistoryToolStripMenuItem.Text = "Show Undo History";
+            this.showUndoHistoryToolStripMenuItem.Click += new System.EventHandler(this.showUndoHistoryToolStripMenuItem_Click);
+            // 
+            // SelectionUndoMenuItem
+            // 
+            this.SelectionUndoMenuItem.Enabled = false;
+            this.SelectionUndoMenuItem.Name = "SelectionUndoMenuItem";
+            this.SelectionUndoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));
+            this.SelectionUndoMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.SelectionUndoMenuItem.Text = "Selection Undo";
+            // 
+            // SelectionRedoMenuItem
+            // 
+            this.SelectionRedoMenuItem.Enabled = false;
+            this.SelectionRedoMenuItem.Name = "SelectionRedoMenuItem";
+            this.SelectionRedoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
+            this.SelectionRedoMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.SelectionRedoMenuItem.Text = "Selection Redo";
+            // 
+            // toolStripSeparator5
+            // 
+            this.toolStripSeparator5.Name = "toolStripSeparator5";
+            this.toolStripSeparator5.Size = new System.Drawing.Size(288, 6);
+            // 
+            // DeselectMenuItem
+            // 
+            this.DeselectMenuItem.Name = "DeselectMenuItem";
+            this.DeselectMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.DeselectMenuItem.Text = "Deselect";
+            this.DeselectMenuItem.Click += new System.EventHandler(this.DeselectMenuItem_Click);
+            // 
+            // SelectAllMenuItem
+            // 
+            this.SelectAllMenuItem.Name = "SelectAllMenuItem";
+            this.SelectAllMenuItem.ShortcutKeyDisplayString = "";
+            this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
+            this.SelectAllMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.SelectAllMenuItem.Text = "Select &All";
+            this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click);
+            // 
+            // SelectBetweenMarkersMenuItem
+            // 
+            this.SelectBetweenMarkersMenuItem.Name = "SelectBetweenMarkersMenuItem";
+            this.SelectBetweenMarkersMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
+                        | System.Windows.Forms.Keys.A)));
+            this.SelectBetweenMarkersMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.SelectBetweenMarkersMenuItem.Text = "Select between Markers";
+            this.SelectBetweenMarkersMenuItem.Click += new System.EventHandler(this.SelectBetweenMarkersMenuItem_Click);
+            // 
+            // ReselectClipboardMenuItem
+            // 
+            this.ReselectClipboardMenuItem.Name = "ReselectClipboardMenuItem";
+            this.ReselectClipboardMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B)));
+            this.ReselectClipboardMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.ReselectClipboardMenuItem.Text = "Reselect Clipboard";
+            this.ReselectClipboardMenuItem.Click += new System.EventHandler(this.ReselectClipboardMenuItem_Click);
+            // 
+            // toolStripSeparator7
+            // 
+            this.toolStripSeparator7.Name = "toolStripSeparator7";
+            this.toolStripSeparator7.Size = new System.Drawing.Size(288, 6);
+            // 
+            // CopyMenuItem
+            // 
+            this.CopyMenuItem.Name = "CopyMenuItem";
+            this.CopyMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
+            this.CopyMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.CopyMenuItem.Text = "Copy";
+            this.CopyMenuItem.Click += new System.EventHandler(this.CopyMenuItem_Click);
+            // 
+            // PasteMenuItem
+            // 
+            this.PasteMenuItem.Name = "PasteMenuItem";
+            this.PasteMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
+            this.PasteMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.PasteMenuItem.Text = "&Paste";
+            this.PasteMenuItem.Click += new System.EventHandler(this.PasteMenuItem_Click);
+            // 
+            // PasteInsertMenuItem
+            // 
+            this.PasteInsertMenuItem.Name = "PasteInsertMenuItem";
+            this.PasteInsertMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
+                        | System.Windows.Forms.Keys.V)));
+            this.PasteInsertMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.PasteInsertMenuItem.Text = "&Paste Insert";
+            this.PasteInsertMenuItem.Click += new System.EventHandler(this.PasteInsertMenuItem_Click);
+            // 
+            // CutMenuItem
+            // 
+            this.CutMenuItem.Name = "CutMenuItem";
+            this.CutMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X)));
+            this.CutMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.CutMenuItem.Text = "&Cut";
+            this.CutMenuItem.Click += new System.EventHandler(this.CutMenuItem_Click);
+            // 
+            // toolStripSeparator8
+            // 
+            this.toolStripSeparator8.Name = "toolStripSeparator8";
+            this.toolStripSeparator8.Size = new System.Drawing.Size(288, 6);
+            // 
+            // ClearMenuItem
+            // 
+            this.ClearMenuItem.Name = "ClearMenuItem";
+            this.ClearMenuItem.ShortcutKeyDisplayString = "";
+            this.ClearMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete)));
+            this.ClearMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.ClearMenuItem.Text = "Clear";
+            this.ClearMenuItem.Click += new System.EventHandler(this.ClearMenuItem_Click);
+            // 
+            // DeleteFramesMenuItem
+            // 
+            this.DeleteFramesMenuItem.Name = "DeleteFramesMenuItem";
+            this.DeleteFramesMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete;
+            this.DeleteFramesMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.DeleteFramesMenuItem.Text = "&Delete";
+            this.DeleteFramesMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click);
+            // 
+            // CloneMenuItem
+            // 
+            this.CloneMenuItem.Name = "CloneMenuItem";
+            this.CloneMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert)));
+            this.CloneMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.CloneMenuItem.Text = "&Clone";
+            this.CloneMenuItem.Click += new System.EventHandler(this.CloneMenuItem_Click);
+            // 
+            // InsertFrameMenuItem
+            // 
+            this.InsertFrameMenuItem.Name = "InsertFrameMenuItem";
+            this.InsertFrameMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
+                        | System.Windows.Forms.Keys.Insert)));
+            this.InsertFrameMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.InsertFrameMenuItem.Text = "&Insert";
+            this.InsertFrameMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click);
+            // 
+            // InsertNumFramesMenuItem
+            // 
+            this.InsertNumFramesMenuItem.Name = "InsertNumFramesMenuItem";
+            this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = "";
+            this.InsertNumFramesMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Insert;
+            this.InsertNumFramesMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.InsertNumFramesMenuItem.Text = "Insert # of Frames";
+            this.InsertNumFramesMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click);
+            // 
+            // toolStripSeparator6
+            // 
+            this.toolStripSeparator6.Name = "toolStripSeparator6";
+            this.toolStripSeparator6.Size = new System.Drawing.Size(288, 6);
+            // 
+            // TruncateMenuItem
+            // 
+            this.TruncateMenuItem.Name = "TruncateMenuItem";
+            this.TruncateMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.TruncateMenuItem.Text = "&Truncate Movie";
+            this.TruncateMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click);
+            // 
+            // ClearGreenzoneMenuItem
+            // 
+            this.ClearGreenzoneMenuItem.Name = "ClearGreenzoneMenuItem";
+            this.ClearGreenzoneMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.ClearGreenzoneMenuItem.Text = "&Clear Savestate History";
+            this.ClearGreenzoneMenuItem.Click += new System.EventHandler(this.ClearGreenzoneMenuItem_Click);
+            // 
+            // GreenzoneICheckSeparator
+            // 
+            this.GreenzoneICheckSeparator.Name = "GreenzoneICheckSeparator";
+            this.GreenzoneICheckSeparator.Size = new System.Drawing.Size(288, 6);
+            // 
+            // StateHistoryIntegrityCheckMenuItem
+            // 
+            this.StateHistoryIntegrityCheckMenuItem.Name = "StateHistoryIntegrityCheckMenuItem";
+            this.StateHistoryIntegrityCheckMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
+                        | System.Windows.Forms.Keys.I)));
+            this.StateHistoryIntegrityCheckMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.StateHistoryIntegrityCheckMenuItem.Text = "State History Integrity Check";
+            this.StateHistoryIntegrityCheckMenuItem.Click += new System.EventHandler(this.StateHistoryIntegrityCheckMenuItem_Click);
+            // 
+            // ConfigSubMenu
+            // 
+            this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.SetMaxUndoLevelsMenuItem,
             this.toolStripSeparator9,
             this.AutoadjustInputMenuItem,
@@ -589,128 +594,128 @@ namespace BizHawk.Client.EmuHawk
             this.AutopauseAtEndOfMovieMenuItem,
             this.sepToolStripMenuItem,
             this.autoHoldFireToolStripMenuItem});
-			this.ConfigSubMenu.Name = "ConfigSubMenu";
-			this.ConfigSubMenu.Size = new System.Drawing.Size(55, 20);
-			this.ConfigSubMenu.Text = "&Config";
-			this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened);
-			// 
-			// SetMaxUndoLevelsMenuItem
-			// 
-			this.SetMaxUndoLevelsMenuItem.Name = "SetMaxUndoLevelsMenuItem";
-			this.SetMaxUndoLevelsMenuItem.Size = new System.Drawing.Size(260, 22);
-			this.SetMaxUndoLevelsMenuItem.Text = "Set max Undo Levels";
-			this.SetMaxUndoLevelsMenuItem.Click += new System.EventHandler(this.SetMaxUndoLevelsMenuItem_Click);
-			// 
-			// toolStripSeparator9
-			// 
-			this.toolStripSeparator9.Name = "toolStripSeparator9";
-			this.toolStripSeparator9.Size = new System.Drawing.Size(257, 6);
-			// 
-			// AutoadjustInputMenuItem
-			// 
-			this.AutoadjustInputMenuItem.CheckOnClick = true;
-			this.AutoadjustInputMenuItem.Name = "AutoadjustInputMenuItem";
-			this.AutoadjustInputMenuItem.Size = new System.Drawing.Size(260, 22);
-			this.AutoadjustInputMenuItem.Text = "Auto-adjust Input according to Lag";
-			// 
-			// toolStripSeparator11
-			// 
-			this.toolStripSeparator11.Name = "toolStripSeparator11";
-			this.toolStripSeparator11.Size = new System.Drawing.Size(257, 6);
-			// 
-			// DrawInputByDraggingMenuItem
-			// 
-			this.DrawInputByDraggingMenuItem.Name = "DrawInputByDraggingMenuItem";
-			this.DrawInputByDraggingMenuItem.Size = new System.Drawing.Size(260, 22);
-			this.DrawInputByDraggingMenuItem.Text = "Draw Input by dragging";
-			this.DrawInputByDraggingMenuItem.Click += new System.EventHandler(this.DrawInputByDraggingMenuItem_Click);
-			// 
-			// applyPatternToPaintedInputToolStripMenuItem
-			// 
-			this.applyPatternToPaintedInputToolStripMenuItem.CheckOnClick = true;
-			this.applyPatternToPaintedInputToolStripMenuItem.Name = "applyPatternToPaintedInputToolStripMenuItem";
-			this.applyPatternToPaintedInputToolStripMenuItem.Size = new System.Drawing.Size(260, 22);
-			this.applyPatternToPaintedInputToolStripMenuItem.Text = "Apply Pattern to painted input";
-			this.applyPatternToPaintedInputToolStripMenuItem.CheckedChanged += new System.EventHandler(this.applyPatternToPaintedInputToolStripMenuItem_CheckedChanged);
-			// 
-			// onlyOnAutoFireColumnsToolStripMenuItem
-			// 
-			this.onlyOnAutoFireColumnsToolStripMenuItem.Checked = true;
-			this.onlyOnAutoFireColumnsToolStripMenuItem.CheckOnClick = true;
-			this.onlyOnAutoFireColumnsToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.onlyOnAutoFireColumnsToolStripMenuItem.Enabled = false;
-			this.onlyOnAutoFireColumnsToolStripMenuItem.Name = "onlyOnAutoFireColumnsToolStripMenuItem";
-			this.onlyOnAutoFireColumnsToolStripMenuItem.Size = new System.Drawing.Size(260, 22);
-			this.onlyOnAutoFireColumnsToolStripMenuItem.Text = "Only on Auto-Fire columns";
-			// 
-			// UseInputKeysItem
-			// 
-			this.UseInputKeysItem.Enabled = false;
-			this.UseInputKeysItem.Name = "UseInputKeysItem";
-			this.UseInputKeysItem.Size = new System.Drawing.Size(260, 22);
-			this.UseInputKeysItem.Text = "Use Input keys for Column Set";
-			// 
-			// toolStripSeparator4
-			// 
-			this.toolStripSeparator4.Name = "toolStripSeparator4";
-			this.toolStripSeparator4.Size = new System.Drawing.Size(257, 6);
-			// 
-			// BindMarkersToInputMenuItem
-			// 
-			this.BindMarkersToInputMenuItem.Checked = true;
-			this.BindMarkersToInputMenuItem.CheckOnClick = true;
-			this.BindMarkersToInputMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.BindMarkersToInputMenuItem.Name = "BindMarkersToInputMenuItem";
-			this.BindMarkersToInputMenuItem.Size = new System.Drawing.Size(260, 22);
-			this.BindMarkersToInputMenuItem.Text = "Bind Markers to Input";
-			this.BindMarkersToInputMenuItem.Click += new System.EventHandler(this.BindMarkersToInputMenuItem_Click);
-			// 
-			// EmptyNewMarkerNotesMenuItem
-			// 
-			this.EmptyNewMarkerNotesMenuItem.Name = "EmptyNewMarkerNotesMenuItem";
-			this.EmptyNewMarkerNotesMenuItem.Size = new System.Drawing.Size(260, 22);
-			this.EmptyNewMarkerNotesMenuItem.Text = "Empty new Marker Notes";
-			this.EmptyNewMarkerNotesMenuItem.Click += new System.EventHandler(this.EmptyNewMarkerNotesMenuItem_Click);
-			// 
-			// toolStripSeparator13
-			// 
-			this.toolStripSeparator13.Name = "toolStripSeparator13";
-			this.toolStripSeparator13.Size = new System.Drawing.Size(257, 6);
-			// 
-			// BranchesRestoreEntireMovieMenuItem
-			// 
-			this.BranchesRestoreEntireMovieMenuItem.Enabled = false;
-			this.BranchesRestoreEntireMovieMenuItem.Name = "BranchesRestoreEntireMovieMenuItem";
-			this.BranchesRestoreEntireMovieMenuItem.Size = new System.Drawing.Size(260, 22);
-			this.BranchesRestoreEntireMovieMenuItem.Text = "Branches restore entire Movie";
-			// 
-			// OsdInBranchScreenshotsMenuItem
-			// 
-			this.OsdInBranchScreenshotsMenuItem.Enabled = false;
-			this.OsdInBranchScreenshotsMenuItem.Name = "OsdInBranchScreenshotsMenuItem";
-			this.OsdInBranchScreenshotsMenuItem.Size = new System.Drawing.Size(260, 22);
-			this.OsdInBranchScreenshotsMenuItem.Text = "OSD in Branch screenshots";
-			// 
-			// toolStripSeparator14
-			// 
-			this.toolStripSeparator14.Name = "toolStripSeparator14";
-			this.toolStripSeparator14.Size = new System.Drawing.Size(257, 6);
-			// 
-			// AutopauseAtEndOfMovieMenuItem
-			// 
-			this.AutopauseAtEndOfMovieMenuItem.Name = "AutopauseAtEndOfMovieMenuItem";
-			this.AutopauseAtEndOfMovieMenuItem.Size = new System.Drawing.Size(260, 22);
-			this.AutopauseAtEndOfMovieMenuItem.Text = "Autopause at end of Movie";
-			this.AutopauseAtEndOfMovieMenuItem.Click += new System.EventHandler(this.AutopauseAtEndMenuItem_Click);
-			// 
-			// sepToolStripMenuItem
-			// 
-			this.sepToolStripMenuItem.Name = "sepToolStripMenuItem";
-			this.sepToolStripMenuItem.Size = new System.Drawing.Size(257, 6);
-			// 
-			// autoHoldFireToolStripMenuItem
-			// 
-			this.autoHoldFireToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ConfigSubMenu.Name = "ConfigSubMenu";
+            this.ConfigSubMenu.Size = new System.Drawing.Size(50, 20);
+            this.ConfigSubMenu.Text = "&Config";
+            this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened);
+            // 
+            // SetMaxUndoLevelsMenuItem
+            // 
+            this.SetMaxUndoLevelsMenuItem.Name = "SetMaxUndoLevelsMenuItem";
+            this.SetMaxUndoLevelsMenuItem.Size = new System.Drawing.Size(253, 22);
+            this.SetMaxUndoLevelsMenuItem.Text = "Set max Undo Levels";
+            this.SetMaxUndoLevelsMenuItem.Click += new System.EventHandler(this.SetMaxUndoLevelsMenuItem_Click);
+            // 
+            // toolStripSeparator9
+            // 
+            this.toolStripSeparator9.Name = "toolStripSeparator9";
+            this.toolStripSeparator9.Size = new System.Drawing.Size(250, 6);
+            // 
+            // AutoadjustInputMenuItem
+            // 
+            this.AutoadjustInputMenuItem.CheckOnClick = true;
+            this.AutoadjustInputMenuItem.Name = "AutoadjustInputMenuItem";
+            this.AutoadjustInputMenuItem.Size = new System.Drawing.Size(253, 22);
+            this.AutoadjustInputMenuItem.Text = "Auto-adjust Input according to Lag";
+            // 
+            // toolStripSeparator11
+            // 
+            this.toolStripSeparator11.Name = "toolStripSeparator11";
+            this.toolStripSeparator11.Size = new System.Drawing.Size(250, 6);
+            // 
+            // DrawInputByDraggingMenuItem
+            // 
+            this.DrawInputByDraggingMenuItem.Name = "DrawInputByDraggingMenuItem";
+            this.DrawInputByDraggingMenuItem.Size = new System.Drawing.Size(253, 22);
+            this.DrawInputByDraggingMenuItem.Text = "Draw Input by dragging";
+            this.DrawInputByDraggingMenuItem.Click += new System.EventHandler(this.DrawInputByDraggingMenuItem_Click);
+            // 
+            // applyPatternToPaintedInputToolStripMenuItem
+            // 
+            this.applyPatternToPaintedInputToolStripMenuItem.CheckOnClick = true;
+            this.applyPatternToPaintedInputToolStripMenuItem.Name = "applyPatternToPaintedInputToolStripMenuItem";
+            this.applyPatternToPaintedInputToolStripMenuItem.Size = new System.Drawing.Size(253, 22);
+            this.applyPatternToPaintedInputToolStripMenuItem.Text = "Apply Pattern to painted input";
+            this.applyPatternToPaintedInputToolStripMenuItem.CheckedChanged += new System.EventHandler(this.applyPatternToPaintedInputToolStripMenuItem_CheckedChanged);
+            // 
+            // onlyOnAutoFireColumnsToolStripMenuItem
+            // 
+            this.onlyOnAutoFireColumnsToolStripMenuItem.Checked = true;
+            this.onlyOnAutoFireColumnsToolStripMenuItem.CheckOnClick = true;
+            this.onlyOnAutoFireColumnsToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.onlyOnAutoFireColumnsToolStripMenuItem.Enabled = false;
+            this.onlyOnAutoFireColumnsToolStripMenuItem.Name = "onlyOnAutoFireColumnsToolStripMenuItem";
+            this.onlyOnAutoFireColumnsToolStripMenuItem.Size = new System.Drawing.Size(253, 22);
+            this.onlyOnAutoFireColumnsToolStripMenuItem.Text = "Only on Auto-Fire columns";
+            // 
+            // UseInputKeysItem
+            // 
+            this.UseInputKeysItem.Enabled = false;
+            this.UseInputKeysItem.Name = "UseInputKeysItem";
+            this.UseInputKeysItem.Size = new System.Drawing.Size(253, 22);
+            this.UseInputKeysItem.Text = "Use Input keys for Column Set";
+            // 
+            // toolStripSeparator4
+            // 
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
+            this.toolStripSeparator4.Size = new System.Drawing.Size(250, 6);
+            // 
+            // BindMarkersToInputMenuItem
+            // 
+            this.BindMarkersToInputMenuItem.Checked = true;
+            this.BindMarkersToInputMenuItem.CheckOnClick = true;
+            this.BindMarkersToInputMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.BindMarkersToInputMenuItem.Name = "BindMarkersToInputMenuItem";
+            this.BindMarkersToInputMenuItem.Size = new System.Drawing.Size(253, 22);
+            this.BindMarkersToInputMenuItem.Text = "Bind Markers to Input";
+            this.BindMarkersToInputMenuItem.Click += new System.EventHandler(this.BindMarkersToInputMenuItem_Click);
+            // 
+            // EmptyNewMarkerNotesMenuItem
+            // 
+            this.EmptyNewMarkerNotesMenuItem.Name = "EmptyNewMarkerNotesMenuItem";
+            this.EmptyNewMarkerNotesMenuItem.Size = new System.Drawing.Size(253, 22);
+            this.EmptyNewMarkerNotesMenuItem.Text = "Empty new Marker Notes";
+            this.EmptyNewMarkerNotesMenuItem.Click += new System.EventHandler(this.EmptyNewMarkerNotesMenuItem_Click);
+            // 
+            // toolStripSeparator13
+            // 
+            this.toolStripSeparator13.Name = "toolStripSeparator13";
+            this.toolStripSeparator13.Size = new System.Drawing.Size(250, 6);
+            // 
+            // BranchesRestoreEntireMovieMenuItem
+            // 
+            this.BranchesRestoreEntireMovieMenuItem.Enabled = false;
+            this.BranchesRestoreEntireMovieMenuItem.Name = "BranchesRestoreEntireMovieMenuItem";
+            this.BranchesRestoreEntireMovieMenuItem.Size = new System.Drawing.Size(253, 22);
+            this.BranchesRestoreEntireMovieMenuItem.Text = "Branches restore entire Movie";
+            // 
+            // OsdInBranchScreenshotsMenuItem
+            // 
+            this.OsdInBranchScreenshotsMenuItem.Enabled = false;
+            this.OsdInBranchScreenshotsMenuItem.Name = "OsdInBranchScreenshotsMenuItem";
+            this.OsdInBranchScreenshotsMenuItem.Size = new System.Drawing.Size(253, 22);
+            this.OsdInBranchScreenshotsMenuItem.Text = "OSD in Branch screenshots";
+            // 
+            // toolStripSeparator14
+            // 
+            this.toolStripSeparator14.Name = "toolStripSeparator14";
+            this.toolStripSeparator14.Size = new System.Drawing.Size(250, 6);
+            // 
+            // AutopauseAtEndOfMovieMenuItem
+            // 
+            this.AutopauseAtEndOfMovieMenuItem.Name = "AutopauseAtEndOfMovieMenuItem";
+            this.AutopauseAtEndOfMovieMenuItem.Size = new System.Drawing.Size(253, 22);
+            this.AutopauseAtEndOfMovieMenuItem.Text = "Autopause at end of Movie";
+            this.AutopauseAtEndOfMovieMenuItem.Click += new System.EventHandler(this.AutopauseAtEndMenuItem_Click);
+            // 
+            // sepToolStripMenuItem
+            // 
+            this.sepToolStripMenuItem.Name = "sepToolStripMenuItem";
+            this.sepToolStripMenuItem.Size = new System.Drawing.Size(250, 6);
+            // 
+            // autoHoldFireToolStripMenuItem
+            // 
+            this.autoHoldFireToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.keepSetPatternsToolStripMenuItem,
             this.sepToolStripMenuItem1,
             this.autoHoldToolStripMenuItem,
@@ -718,457 +723,458 @@ namespace BizHawk.Client.EmuHawk
             this.customPatternToolStripMenuItem,
             this.setpToolStripMenuItem,
             this.setCustomsToolStripMenuItem});
-			this.autoHoldFireToolStripMenuItem.Name = "autoHoldFireToolStripMenuItem";
-			this.autoHoldFireToolStripMenuItem.Size = new System.Drawing.Size(260, 22);
-			this.autoHoldFireToolStripMenuItem.Text = "Auto Hold/Fire";
-			// 
-			// keepSetPatternsToolStripMenuItem
-			// 
-			this.keepSetPatternsToolStripMenuItem.CheckOnClick = true;
-			this.keepSetPatternsToolStripMenuItem.Name = "keepSetPatternsToolStripMenuItem";
-			this.keepSetPatternsToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
-			this.keepSetPatternsToolStripMenuItem.Text = "Keep set patterns";
-			// 
-			// sepToolStripMenuItem1
-			// 
-			this.sepToolStripMenuItem1.Name = "sepToolStripMenuItem1";
-			this.sepToolStripMenuItem1.Size = new System.Drawing.Size(161, 6);
-			// 
-			// autoHoldToolStripMenuItem
-			// 
-			this.autoHoldToolStripMenuItem.Checked = true;
-			this.autoHoldToolStripMenuItem.CheckOnClick = true;
-			this.autoHoldToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.autoHoldToolStripMenuItem.Name = "autoHoldToolStripMenuItem";
-			this.autoHoldToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
-			this.autoHoldToolStripMenuItem.Text = "Auto-Hold";
-			this.autoHoldToolStripMenuItem.CheckedChanged += new System.EventHandler(this.autoHoldToolStripMenuItem_CheckedChanged);
-			// 
-			// autoFireToolStripMenuItem
-			// 
-			this.autoFireToolStripMenuItem.CheckOnClick = true;
-			this.autoFireToolStripMenuItem.Name = "autoFireToolStripMenuItem";
-			this.autoFireToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
-			this.autoFireToolStripMenuItem.Text = "Auto-Fire";
-			this.autoFireToolStripMenuItem.CheckedChanged += new System.EventHandler(this.autoFireToolStripMenuItem_CheckedChanged);
-			// 
-			// customPatternToolStripMenuItem
-			// 
-			this.customPatternToolStripMenuItem.CheckOnClick = true;
-			this.customPatternToolStripMenuItem.Name = "customPatternToolStripMenuItem";
-			this.customPatternToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
-			this.customPatternToolStripMenuItem.Text = "Custom Pattern";
-			this.customPatternToolStripMenuItem.CheckedChanged += new System.EventHandler(this.customPatternToolStripMenuItem_CheckedChanged);
-			// 
-			// setpToolStripMenuItem
-			// 
-			this.setpToolStripMenuItem.Name = "setpToolStripMenuItem";
-			this.setpToolStripMenuItem.Size = new System.Drawing.Size(161, 6);
-			// 
-			// setCustomsToolStripMenuItem
-			// 
-			this.setCustomsToolStripMenuItem.Name = "setCustomsToolStripMenuItem";
-			this.setCustomsToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
-			this.setCustomsToolStripMenuItem.Text = "Set Customs...";
-			this.setCustomsToolStripMenuItem.Click += new System.EventHandler(this.setCustomsToolStripMenuItem_Click);
-			// 
-			// MetaSubMenu
-			// 
-			this.MetaSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.autoHoldFireToolStripMenuItem.Name = "autoHoldFireToolStripMenuItem";
+            this.autoHoldFireToolStripMenuItem.Size = new System.Drawing.Size(253, 22);
+            this.autoHoldFireToolStripMenuItem.Text = "Auto Hold/Fire";
+            // 
+            // keepSetPatternsToolStripMenuItem
+            // 
+            this.keepSetPatternsToolStripMenuItem.CheckOnClick = true;
+            this.keepSetPatternsToolStripMenuItem.Name = "keepSetPatternsToolStripMenuItem";
+            this.keepSetPatternsToolStripMenuItem.Size = new System.Drawing.Size(171, 22);
+            this.keepSetPatternsToolStripMenuItem.Text = "Keep set patterns";
+            // 
+            // sepToolStripMenuItem1
+            // 
+            this.sepToolStripMenuItem1.Name = "sepToolStripMenuItem1";
+            this.sepToolStripMenuItem1.Size = new System.Drawing.Size(168, 6);
+            // 
+            // autoHoldToolStripMenuItem
+            // 
+            this.autoHoldToolStripMenuItem.Checked = true;
+            this.autoHoldToolStripMenuItem.CheckOnClick = true;
+            this.autoHoldToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.autoHoldToolStripMenuItem.Name = "autoHoldToolStripMenuItem";
+            this.autoHoldToolStripMenuItem.Size = new System.Drawing.Size(171, 22);
+            this.autoHoldToolStripMenuItem.Text = "Auto-Hold";
+            this.autoHoldToolStripMenuItem.CheckedChanged += new System.EventHandler(this.autoHoldToolStripMenuItem_CheckedChanged);
+            // 
+            // autoFireToolStripMenuItem
+            // 
+            this.autoFireToolStripMenuItem.CheckOnClick = true;
+            this.autoFireToolStripMenuItem.Name = "autoFireToolStripMenuItem";
+            this.autoFireToolStripMenuItem.Size = new System.Drawing.Size(171, 22);
+            this.autoFireToolStripMenuItem.Text = "Auto-Fire";
+            this.autoFireToolStripMenuItem.CheckedChanged += new System.EventHandler(this.autoFireToolStripMenuItem_CheckedChanged);
+            // 
+            // customPatternToolStripMenuItem
+            // 
+            this.customPatternToolStripMenuItem.CheckOnClick = true;
+            this.customPatternToolStripMenuItem.Name = "customPatternToolStripMenuItem";
+            this.customPatternToolStripMenuItem.Size = new System.Drawing.Size(171, 22);
+            this.customPatternToolStripMenuItem.Text = "Custom Pattern";
+            this.customPatternToolStripMenuItem.CheckedChanged += new System.EventHandler(this.customPatternToolStripMenuItem_CheckedChanged);
+            // 
+            // setpToolStripMenuItem
+            // 
+            this.setpToolStripMenuItem.Name = "setpToolStripMenuItem";
+            this.setpToolStripMenuItem.Size = new System.Drawing.Size(168, 6);
+            // 
+            // setCustomsToolStripMenuItem
+            // 
+            this.setCustomsToolStripMenuItem.Name = "setCustomsToolStripMenuItem";
+            this.setCustomsToolStripMenuItem.Size = new System.Drawing.Size(171, 22);
+            this.setCustomsToolStripMenuItem.Text = "Set Customs...";
+            this.setCustomsToolStripMenuItem.Click += new System.EventHandler(this.setCustomsToolStripMenuItem_Click);
+            // 
+            // MetaSubMenu
+            // 
+            this.MetaSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.HeaderMenuItem,
             this.StateHistorySettingsMenuItem,
             this.CommentsMenuItem,
             this.SubtitlesMenuItem,
             this.toolStripSeparator21,
             this.DefaultStateSettingsMenuItem});
-			this.MetaSubMenu.Name = "MetaSubMenu";
-			this.MetaSubMenu.Size = new System.Drawing.Size(69, 20);
-			this.MetaSubMenu.Text = "&Metadata";
-			// 
-			// HeaderMenuItem
-			// 
-			this.HeaderMenuItem.Name = "HeaderMenuItem";
-			this.HeaderMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.HeaderMenuItem.Text = "&Header...";
-			this.HeaderMenuItem.Click += new System.EventHandler(this.HeaderMenuItem_Click);
-			// 
-			// StateHistorySettingsMenuItem
-			// 
-			this.StateHistorySettingsMenuItem.Name = "StateHistorySettingsMenuItem";
-			this.StateHistorySettingsMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.StateHistorySettingsMenuItem.Text = "&Savestate History Settings...";
-			this.StateHistorySettingsMenuItem.Click += new System.EventHandler(this.StateHistorySettingsMenuItem_Click);
-			// 
-			// CommentsMenuItem
-			// 
-			this.CommentsMenuItem.Name = "CommentsMenuItem";
-			this.CommentsMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.CommentsMenuItem.Text = "&Comments...";
-			this.CommentsMenuItem.Click += new System.EventHandler(this.CommentsMenuItem_Click);
-			// 
-			// SubtitlesMenuItem
-			// 
-			this.SubtitlesMenuItem.Name = "SubtitlesMenuItem";
-			this.SubtitlesMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.SubtitlesMenuItem.Text = "&Subtitles...";
-			this.SubtitlesMenuItem.Click += new System.EventHandler(this.SubtitlesMenuItem_Click);
-			// 
-			// toolStripSeparator21
-			// 
-			this.toolStripSeparator21.Name = "toolStripSeparator21";
-			this.toolStripSeparator21.Size = new System.Drawing.Size(233, 6);
-			// 
-			// DefaultStateSettingsMenuItem
-			// 
-			this.DefaultStateSettingsMenuItem.Name = "DefaultStateSettingsMenuItem";
-			this.DefaultStateSettingsMenuItem.Size = new System.Drawing.Size(236, 22);
-			this.DefaultStateSettingsMenuItem.Text = "&Default State History Settings...";
-			this.DefaultStateSettingsMenuItem.Click += new System.EventHandler(this.DefaultStateSettingsMenuItem_Click);
-			// 
-			// SettingsSubMenu
-			// 
-			this.SettingsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.MetaSubMenu.Name = "MetaSubMenu";
+            this.MetaSubMenu.Size = new System.Drawing.Size(65, 20);
+            this.MetaSubMenu.Text = "&Metadata";
+            // 
+            // HeaderMenuItem
+            // 
+            this.HeaderMenuItem.Name = "HeaderMenuItem";
+            this.HeaderMenuItem.Size = new System.Drawing.Size(240, 22);
+            this.HeaderMenuItem.Text = "&Header...";
+            this.HeaderMenuItem.Click += new System.EventHandler(this.HeaderMenuItem_Click);
+            // 
+            // StateHistorySettingsMenuItem
+            // 
+            this.StateHistorySettingsMenuItem.Name = "StateHistorySettingsMenuItem";
+            this.StateHistorySettingsMenuItem.Size = new System.Drawing.Size(240, 22);
+            this.StateHistorySettingsMenuItem.Text = "&Savestate History Settings...";
+            this.StateHistorySettingsMenuItem.Click += new System.EventHandler(this.StateHistorySettingsMenuItem_Click);
+            // 
+            // CommentsMenuItem
+            // 
+            this.CommentsMenuItem.Name = "CommentsMenuItem";
+            this.CommentsMenuItem.Size = new System.Drawing.Size(240, 22);
+            this.CommentsMenuItem.Text = "&Comments...";
+            this.CommentsMenuItem.Click += new System.EventHandler(this.CommentsMenuItem_Click);
+            // 
+            // SubtitlesMenuItem
+            // 
+            this.SubtitlesMenuItem.Name = "SubtitlesMenuItem";
+            this.SubtitlesMenuItem.Size = new System.Drawing.Size(240, 22);
+            this.SubtitlesMenuItem.Text = "&Subtitles...";
+            this.SubtitlesMenuItem.Click += new System.EventHandler(this.SubtitlesMenuItem_Click);
+            // 
+            // toolStripSeparator21
+            // 
+            this.toolStripSeparator21.Name = "toolStripSeparator21";
+            this.toolStripSeparator21.Size = new System.Drawing.Size(237, 6);
+            // 
+            // DefaultStateSettingsMenuItem
+            // 
+            this.DefaultStateSettingsMenuItem.Name = "DefaultStateSettingsMenuItem";
+            this.DefaultStateSettingsMenuItem.Size = new System.Drawing.Size(240, 22);
+            this.DefaultStateSettingsMenuItem.Text = "&Default State History Settings...";
+            this.DefaultStateSettingsMenuItem.Click += new System.EventHandler(this.DefaultStateSettingsMenuItem_Click);
+            // 
+            // SettingsSubMenu
+            // 
+            this.SettingsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.RotateMenuItem,
             this.HideLagFramesSubMenu,
+            this.iconsToolStripMenuItem,
             this.toolStripSeparator23,
             this.followCursorToolStripMenuItem,
             this.toolStripSeparator25,
             this.wheelScrollSpeedToolStripMenuItem});
-			this.SettingsSubMenu.Name = "SettingsSubMenu";
-			this.SettingsSubMenu.Size = new System.Drawing.Size(61, 20);
-			this.SettingsSubMenu.Text = "&Settings";
-			this.SettingsSubMenu.DropDownOpened += new System.EventHandler(this.SettingsSubMenu_DropDownOpened);
-			// 
-			// RotateMenuItem
-			// 
-			this.RotateMenuItem.Name = "RotateMenuItem";
-			this.RotateMenuItem.Size = new System.Drawing.Size(183, 22);
-			this.RotateMenuItem.Text = "Rotate";
-			this.RotateMenuItem.Click += new System.EventHandler(this.RotateMenuItem_Click);
-			// 
-			// HideLagFramesSubMenu
-			// 
-			this.HideLagFramesSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.SettingsSubMenu.Name = "SettingsSubMenu";
+            this.SettingsSubMenu.Size = new System.Drawing.Size(58, 20);
+            this.SettingsSubMenu.Text = "&Settings";
+            this.SettingsSubMenu.DropDownOpened += new System.EventHandler(this.SettingsSubMenu_DropDownOpened);
+            // 
+            // RotateMenuItem
+            // 
+            this.RotateMenuItem.Name = "RotateMenuItem";
+            this.RotateMenuItem.Size = new System.Drawing.Size(188, 22);
+            this.RotateMenuItem.Text = "Rotate";
+            this.RotateMenuItem.Click += new System.EventHandler(this.RotateMenuItem_Click);
+            // 
+            // HideLagFramesSubMenu
+            // 
+            this.HideLagFramesSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.HideLagFrames0,
             this.HideLagFrames1,
             this.HideLagFrames2,
             this.HideLagFrames3,
             this.toolStripSeparator12,
             this.hideWasLagFramesToolStripMenuItem});
-			this.HideLagFramesSubMenu.Name = "HideLagFramesSubMenu";
-			this.HideLagFramesSubMenu.Size = new System.Drawing.Size(183, 22);
-			this.HideLagFramesSubMenu.Text = "Hide Lag Frames";
-			this.HideLagFramesSubMenu.DropDownOpened += new System.EventHandler(this.HideLagFramesSubMenu_DropDownOpened);
-			// 
-			// HideLagFrames0
-			// 
-			this.HideLagFrames0.Checked = true;
-			this.HideLagFrames0.CheckOnClick = true;
-			this.HideLagFrames0.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.HideLagFrames0.Name = "HideLagFrames0";
-			this.HideLagFrames0.Size = new System.Drawing.Size(184, 22);
-			this.HideLagFrames0.Tag = 0;
-			this.HideLagFrames0.Text = "Don\'t Hide";
-			this.HideLagFrames0.Click += new System.EventHandler(this.HideLagFramesX_Click);
-			// 
-			// HideLagFrames1
-			// 
-			this.HideLagFrames1.CheckOnClick = true;
-			this.HideLagFrames1.Name = "HideLagFrames1";
-			this.HideLagFrames1.Size = new System.Drawing.Size(184, 22);
-			this.HideLagFrames1.Tag = 1;
-			this.HideLagFrames1.Text = "1 (30 fps)";
-			this.HideLagFrames1.Click += new System.EventHandler(this.HideLagFramesX_Click);
-			// 
-			// HideLagFrames2
-			// 
-			this.HideLagFrames2.Name = "HideLagFrames2";
-			this.HideLagFrames2.Size = new System.Drawing.Size(184, 22);
-			this.HideLagFrames2.Tag = 2;
-			this.HideLagFrames2.Text = "2 (20 fps)";
-			this.HideLagFrames2.Click += new System.EventHandler(this.HideLagFramesX_Click);
-			// 
-			// HideLagFrames3
-			// 
-			this.HideLagFrames3.CheckOnClick = true;
-			this.HideLagFrames3.Name = "HideLagFrames3";
-			this.HideLagFrames3.Size = new System.Drawing.Size(184, 22);
-			this.HideLagFrames3.Tag = 3;
-			this.HideLagFrames3.Text = "3 (15fps)";
-			this.HideLagFrames3.Click += new System.EventHandler(this.HideLagFramesX_Click);
-			// 
-			// toolStripSeparator12
-			// 
-			this.toolStripSeparator12.Name = "toolStripSeparator12";
-			this.toolStripSeparator12.Size = new System.Drawing.Size(181, 6);
-			// 
-			// hideWasLagFramesToolStripMenuItem
-			// 
-			this.hideWasLagFramesToolStripMenuItem.CheckOnClick = true;
-			this.hideWasLagFramesToolStripMenuItem.Name = "hideWasLagFramesToolStripMenuItem";
-			this.hideWasLagFramesToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
-			this.hideWasLagFramesToolStripMenuItem.Text = "Hide WasLag Frames";
-			this.hideWasLagFramesToolStripMenuItem.Click += new System.EventHandler(this.hideWasLagFramesToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator23
-			// 
-			this.toolStripSeparator23.Name = "toolStripSeparator23";
-			this.toolStripSeparator23.Size = new System.Drawing.Size(180, 6);
-			// 
-			// followCursorToolStripMenuItem
-			// 
-			this.followCursorToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.HideLagFramesSubMenu.Name = "HideLagFramesSubMenu";
+            this.HideLagFramesSubMenu.Size = new System.Drawing.Size(188, 22);
+            this.HideLagFramesSubMenu.Text = "Hide Lag Frames";
+            this.HideLagFramesSubMenu.DropDownOpened += new System.EventHandler(this.HideLagFramesSubMenu_DropDownOpened);
+            // 
+            // HideLagFrames0
+            // 
+            this.HideLagFrames0.Checked = true;
+            this.HideLagFrames0.CheckOnClick = true;
+            this.HideLagFrames0.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.HideLagFrames0.Name = "HideLagFrames0";
+            this.HideLagFrames0.Size = new System.Drawing.Size(185, 22);
+            this.HideLagFrames0.Tag = 0;
+            this.HideLagFrames0.Text = "Don\'t Hide";
+            this.HideLagFrames0.Click += new System.EventHandler(this.HideLagFramesX_Click);
+            // 
+            // HideLagFrames1
+            // 
+            this.HideLagFrames1.CheckOnClick = true;
+            this.HideLagFrames1.Name = "HideLagFrames1";
+            this.HideLagFrames1.Size = new System.Drawing.Size(185, 22);
+            this.HideLagFrames1.Tag = 1;
+            this.HideLagFrames1.Text = "1 (30 fps)";
+            this.HideLagFrames1.Click += new System.EventHandler(this.HideLagFramesX_Click);
+            // 
+            // HideLagFrames2
+            // 
+            this.HideLagFrames2.Name = "HideLagFrames2";
+            this.HideLagFrames2.Size = new System.Drawing.Size(185, 22);
+            this.HideLagFrames2.Tag = 2;
+            this.HideLagFrames2.Text = "2 (20 fps)";
+            this.HideLagFrames2.Click += new System.EventHandler(this.HideLagFramesX_Click);
+            // 
+            // HideLagFrames3
+            // 
+            this.HideLagFrames3.CheckOnClick = true;
+            this.HideLagFrames3.Name = "HideLagFrames3";
+            this.HideLagFrames3.Size = new System.Drawing.Size(185, 22);
+            this.HideLagFrames3.Tag = 3;
+            this.HideLagFrames3.Text = "3 (15fps)";
+            this.HideLagFrames3.Click += new System.EventHandler(this.HideLagFramesX_Click);
+            // 
+            // toolStripSeparator12
+            // 
+            this.toolStripSeparator12.Name = "toolStripSeparator12";
+            this.toolStripSeparator12.Size = new System.Drawing.Size(182, 6);
+            // 
+            // hideWasLagFramesToolStripMenuItem
+            // 
+            this.hideWasLagFramesToolStripMenuItem.CheckOnClick = true;
+            this.hideWasLagFramesToolStripMenuItem.Name = "hideWasLagFramesToolStripMenuItem";
+            this.hideWasLagFramesToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
+            this.hideWasLagFramesToolStripMenuItem.Text = "Hide WasLag Frames";
+            this.hideWasLagFramesToolStripMenuItem.Click += new System.EventHandler(this.hideWasLagFramesToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator23
+            // 
+            this.toolStripSeparator23.Name = "toolStripSeparator23";
+            this.toolStripSeparator23.Size = new System.Drawing.Size(185, 6);
+            // 
+            // followCursorToolStripMenuItem
+            // 
+            this.followCursorToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.alwaysScrollToolStripMenuItem,
             this.toolStripSeparator24,
             this.scrollToViewToolStripMenuItem,
             this.scrollToTopToolStripMenuItem,
             this.scrollToBottomToolStripMenuItem,
             this.scrollToCenterToolStripMenuItem});
-			this.followCursorToolStripMenuItem.Name = "followCursorToolStripMenuItem";
-			this.followCursorToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
-			this.followCursorToolStripMenuItem.Text = "Follow Cursor";
-			this.followCursorToolStripMenuItem.DropDownOpened += new System.EventHandler(this.followCursorToolStripMenuItem_DropDownOpened);
-			// 
-			// alwaysScrollToolStripMenuItem
-			// 
-			this.alwaysScrollToolStripMenuItem.CheckOnClick = true;
-			this.alwaysScrollToolStripMenuItem.Name = "alwaysScrollToolStripMenuItem";
-			this.alwaysScrollToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
-			this.alwaysScrollToolStripMenuItem.Text = "Always Scroll";
-			this.alwaysScrollToolStripMenuItem.Click += new System.EventHandler(this.alwaysScrollToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator24
-			// 
-			this.toolStripSeparator24.Name = "toolStripSeparator24";
-			this.toolStripSeparator24.Size = new System.Drawing.Size(157, 6);
-			// 
-			// scrollToViewToolStripMenuItem
-			// 
-			this.scrollToViewToolStripMenuItem.Checked = true;
-			this.scrollToViewToolStripMenuItem.CheckOnClick = true;
-			this.scrollToViewToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.scrollToViewToolStripMenuItem.Name = "scrollToViewToolStripMenuItem";
-			this.scrollToViewToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
-			this.scrollToViewToolStripMenuItem.Text = "Scroll to View";
-			this.scrollToViewToolStripMenuItem.Click += new System.EventHandler(this.scrollToViewToolStripMenuItem_Click);
-			// 
-			// scrollToTopToolStripMenuItem
-			// 
-			this.scrollToTopToolStripMenuItem.CheckOnClick = true;
-			this.scrollToTopToolStripMenuItem.Name = "scrollToTopToolStripMenuItem";
-			this.scrollToTopToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
-			this.scrollToTopToolStripMenuItem.Text = "Scroll to Top";
-			this.scrollToTopToolStripMenuItem.Click += new System.EventHandler(this.scrollToTopToolStripMenuItem_Click);
-			// 
-			// scrollToBottomToolStripMenuItem
-			// 
-			this.scrollToBottomToolStripMenuItem.CheckOnClick = true;
-			this.scrollToBottomToolStripMenuItem.Name = "scrollToBottomToolStripMenuItem";
-			this.scrollToBottomToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
-			this.scrollToBottomToolStripMenuItem.Text = "Scroll to Bottom";
-			this.scrollToBottomToolStripMenuItem.Click += new System.EventHandler(this.scrollToBottomToolStripMenuItem_Click);
-			// 
-			// scrollToCenterToolStripMenuItem
-			// 
-			this.scrollToCenterToolStripMenuItem.CheckOnClick = true;
-			this.scrollToCenterToolStripMenuItem.Name = "scrollToCenterToolStripMenuItem";
-			this.scrollToCenterToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
-			this.scrollToCenterToolStripMenuItem.Text = "Scroll to Center";
-			this.scrollToCenterToolStripMenuItem.Click += new System.EventHandler(this.scrollToCenterToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator25
-			// 
-			this.toolStripSeparator25.Name = "toolStripSeparator25";
-			this.toolStripSeparator25.Size = new System.Drawing.Size(180, 6);
-			// 
-			// wheelScrollSpeedToolStripMenuItem
-			// 
-			this.wheelScrollSpeedToolStripMenuItem.Name = "wheelScrollSpeedToolStripMenuItem";
-			this.wheelScrollSpeedToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
-			this.wheelScrollSpeedToolStripMenuItem.Text = "Wheel Scroll Speed...";
-			this.wheelScrollSpeedToolStripMenuItem.Click += new System.EventHandler(this.wheelScrollSpeedToolStripMenuItem_Click);
-			// 
-			// ColumnsSubMenu
-			// 
-			this.ColumnsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.followCursorToolStripMenuItem.Name = "followCursorToolStripMenuItem";
+            this.followCursorToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
+            this.followCursorToolStripMenuItem.Text = "Follow Cursor";
+            this.followCursorToolStripMenuItem.DropDownOpened += new System.EventHandler(this.followCursorToolStripMenuItem_DropDownOpened);
+            // 
+            // alwaysScrollToolStripMenuItem
+            // 
+            this.alwaysScrollToolStripMenuItem.CheckOnClick = true;
+            this.alwaysScrollToolStripMenuItem.Name = "alwaysScrollToolStripMenuItem";
+            this.alwaysScrollToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.alwaysScrollToolStripMenuItem.Text = "Always Scroll";
+            this.alwaysScrollToolStripMenuItem.Click += new System.EventHandler(this.alwaysScrollToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator24
+            // 
+            this.toolStripSeparator24.Name = "toolStripSeparator24";
+            this.toolStripSeparator24.Size = new System.Drawing.Size(157, 6);
+            // 
+            // scrollToViewToolStripMenuItem
+            // 
+            this.scrollToViewToolStripMenuItem.Checked = true;
+            this.scrollToViewToolStripMenuItem.CheckOnClick = true;
+            this.scrollToViewToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.scrollToViewToolStripMenuItem.Name = "scrollToViewToolStripMenuItem";
+            this.scrollToViewToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.scrollToViewToolStripMenuItem.Text = "Scroll to View";
+            this.scrollToViewToolStripMenuItem.Click += new System.EventHandler(this.scrollToViewToolStripMenuItem_Click);
+            // 
+            // scrollToTopToolStripMenuItem
+            // 
+            this.scrollToTopToolStripMenuItem.CheckOnClick = true;
+            this.scrollToTopToolStripMenuItem.Name = "scrollToTopToolStripMenuItem";
+            this.scrollToTopToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.scrollToTopToolStripMenuItem.Text = "Scroll to Top";
+            this.scrollToTopToolStripMenuItem.Click += new System.EventHandler(this.scrollToTopToolStripMenuItem_Click);
+            // 
+            // scrollToBottomToolStripMenuItem
+            // 
+            this.scrollToBottomToolStripMenuItem.CheckOnClick = true;
+            this.scrollToBottomToolStripMenuItem.Name = "scrollToBottomToolStripMenuItem";
+            this.scrollToBottomToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.scrollToBottomToolStripMenuItem.Text = "Scroll to Bottom";
+            this.scrollToBottomToolStripMenuItem.Click += new System.EventHandler(this.scrollToBottomToolStripMenuItem_Click);
+            // 
+            // scrollToCenterToolStripMenuItem
+            // 
+            this.scrollToCenterToolStripMenuItem.CheckOnClick = true;
+            this.scrollToCenterToolStripMenuItem.Name = "scrollToCenterToolStripMenuItem";
+            this.scrollToCenterToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.scrollToCenterToolStripMenuItem.Text = "Scroll to Center";
+            this.scrollToCenterToolStripMenuItem.Click += new System.EventHandler(this.scrollToCenterToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator25
+            // 
+            this.toolStripSeparator25.Name = "toolStripSeparator25";
+            this.toolStripSeparator25.Size = new System.Drawing.Size(185, 6);
+            // 
+            // wheelScrollSpeedToolStripMenuItem
+            // 
+            this.wheelScrollSpeedToolStripMenuItem.Name = "wheelScrollSpeedToolStripMenuItem";
+            this.wheelScrollSpeedToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
+            this.wheelScrollSpeedToolStripMenuItem.Text = "Wheel Scroll Speed...";
+            this.wheelScrollSpeedToolStripMenuItem.Click += new System.EventHandler(this.wheelScrollSpeedToolStripMenuItem_Click);
+            // 
+            // ColumnsSubMenu
+            // 
+            this.ColumnsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripSeparator19});
-			this.ColumnsSubMenu.Name = "ColumnsSubMenu";
-			this.ColumnsSubMenu.Size = new System.Drawing.Size(67, 20);
-			this.ColumnsSubMenu.Text = "&Columns";
-			// 
-			// toolStripSeparator19
-			// 
-			this.toolStripSeparator19.Name = "toolStripSeparator19";
-			this.toolStripSeparator19.Size = new System.Drawing.Size(57, 6);
-			// 
-			// HelpSubMenu
-			// 
-			this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ColumnsSubMenu.Name = "ColumnsSubMenu";
+            this.ColumnsSubMenu.Size = new System.Drawing.Size(59, 20);
+            this.ColumnsSubMenu.Text = "&Columns";
+            // 
+            // toolStripSeparator19
+            // 
+            this.toolStripSeparator19.Name = "toolStripSeparator19";
+            this.toolStripSeparator19.Size = new System.Drawing.Size(149, 6);
+            // 
+            // HelpSubMenu
+            // 
+            this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.EnableTooltipsMenuItem,
             this.toolStripSeparator10,
             this.aboutToolStripMenuItem});
-			this.HelpSubMenu.Name = "HelpSubMenu";
-			this.HelpSubMenu.Size = new System.Drawing.Size(44, 20);
-			this.HelpSubMenu.Text = "&Help";
-			// 
-			// EnableTooltipsMenuItem
-			// 
-			this.EnableTooltipsMenuItem.Enabled = false;
-			this.EnableTooltipsMenuItem.Name = "EnableTooltipsMenuItem";
-			this.EnableTooltipsMenuItem.Size = new System.Drawing.Size(155, 22);
-			this.EnableTooltipsMenuItem.Text = "&Enable Tooltips";
-			// 
-			// toolStripSeparator10
-			// 
-			this.toolStripSeparator10.Name = "toolStripSeparator10";
-			this.toolStripSeparator10.Size = new System.Drawing.Size(152, 6);
-			// 
-			// aboutToolStripMenuItem
-			// 
-			this.aboutToolStripMenuItem.Enabled = false;
-			this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-			this.aboutToolStripMenuItem.Size = new System.Drawing.Size(155, 22);
-			this.aboutToolStripMenuItem.Text = "&About";
-			// 
-			// TasView
-			// 
-			this.TasView.AllowColumnReorder = false;
-			this.TasView.AllowColumnResize = 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.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.TasView.FullRowSelect = true;
-			this.TasView.HideWasLagFrames = false;
-			this.TasView.HorizontalOrientation = false;
-			this.TasView.LagFramesToHide = 0;
-			this.TasView.Location = new System.Drawing.Point(3, 0);
-			this.TasView.MaxCharactersInHorizontal = 1;
-			this.TasView.MultiSelect = false;
-			this.TasView.Name = "TasView";
-			this.TasView.RowCount = 0;
-			this.TasView.ScrollSpeed = 1;
-			this.TasView.Size = new System.Drawing.Size(289, 528);
-			this.TasView.TabIndex = 1;
-			this.TasView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnClick);
-			this.TasView.ColumnRightClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnRightClick);
-			this.TasView.SelectedIndexChanged += new System.EventHandler(this.TasView_SelectedIndexChanged);
-			this.TasView.RightMouseScrolled += new BizHawk.Client.EmuHawk.InputRoll.RightMouseScrollEventHandler(this.TasView_MouseWheel);
-			this.TasView.ColumnReordered += new BizHawk.Client.EmuHawk.InputRoll.ColumnReorderedEventHandler(this.TasView_ColumnReordered);
-			this.TasView.CellDropped += new BizHawk.Client.EmuHawk.InputRoll.CellDroppedEvent(this.TasView_CellDropped);
-			this.TasView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TasView_KeyDown);
-			this.TasView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseDoubleClick);
-			this.TasView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseDown);
-			this.TasView.MouseEnter += new System.EventHandler(this.TasView_MouseEnter);
-			this.TasView.MouseMove += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseMove);
-			this.TasView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseUp);
-			this.TasView.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.TasView_PreviewKeyDown);
-			// 
-			// TasStatusStrip
-			// 
-			this.TasStatusStrip.ClickThrough = true;
-			this.TasStatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.HelpSubMenu.Name = "HelpSubMenu";
+            this.HelpSubMenu.Size = new System.Drawing.Size(40, 20);
+            this.HelpSubMenu.Text = "&Help";
+            // 
+            // EnableTooltipsMenuItem
+            // 
+            this.EnableTooltipsMenuItem.Enabled = false;
+            this.EnableTooltipsMenuItem.Name = "EnableTooltipsMenuItem";
+            this.EnableTooltipsMenuItem.Size = new System.Drawing.Size(157, 22);
+            this.EnableTooltipsMenuItem.Text = "&Enable Tooltips";
+            // 
+            // toolStripSeparator10
+            // 
+            this.toolStripSeparator10.Name = "toolStripSeparator10";
+            this.toolStripSeparator10.Size = new System.Drawing.Size(154, 6);
+            // 
+            // aboutToolStripMenuItem
+            // 
+            this.aboutToolStripMenuItem.Enabled = false;
+            this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
+            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+            this.aboutToolStripMenuItem.Text = "&About";
+            // 
+            // TasView
+            // 
+            this.TasView.AllowColumnReorder = false;
+            this.TasView.AllowColumnResize = 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.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.TasView.FullRowSelect = true;
+            this.TasView.HideWasLagFrames = false;
+            this.TasView.HorizontalOrientation = false;
+            this.TasView.LagFramesToHide = 0;
+            this.TasView.Location = new System.Drawing.Point(3, 0);
+            this.TasView.MaxCharactersInHorizontal = 1;
+            this.TasView.MultiSelect = false;
+            this.TasView.Name = "TasView";
+            this.TasView.RowCount = 0;
+            this.TasView.ScrollSpeed = 1;
+            this.TasView.Size = new System.Drawing.Size(289, 528);
+            this.TasView.TabIndex = 1;
+            this.TasView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnClick);
+            this.TasView.ColumnRightClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnRightClick);
+            this.TasView.SelectedIndexChanged += new System.EventHandler(this.TasView_SelectedIndexChanged);
+            this.TasView.RightMouseScrolled += new BizHawk.Client.EmuHawk.InputRoll.RightMouseScrollEventHandler(this.TasView_MouseWheel);
+            this.TasView.ColumnReordered += new BizHawk.Client.EmuHawk.InputRoll.ColumnReorderedEventHandler(this.TasView_ColumnReordered);
+            this.TasView.CellDropped += new BizHawk.Client.EmuHawk.InputRoll.CellDroppedEvent(this.TasView_CellDropped);
+            this.TasView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TasView_KeyDown);
+            this.TasView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseDoubleClick);
+            this.TasView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseDown);
+            this.TasView.MouseEnter += new System.EventHandler(this.TasView_MouseEnter);
+            this.TasView.MouseMove += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseMove);
+            this.TasView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseUp);
+            this.TasView.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.TasView_PreviewKeyDown);
+            // 
+            // TasStatusStrip
+            // 
+            this.TasStatusStrip.ClickThrough = true;
+            this.TasStatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.MessageStatusLabel,
             this.SavingProgressBar,
             this.toolStripStatusLabel2,
             this.SplicerStatusLabel});
-			this.TasStatusStrip.Location = new System.Drawing.Point(0, 554);
-			this.TasStatusStrip.Name = "TasStatusStrip";
-			this.TasStatusStrip.Size = new System.Drawing.Size(509, 22);
-			this.TasStatusStrip.TabIndex = 4;
-			this.TasStatusStrip.Text = "statusStrip1";
-			// 
-			// MessageStatusLabel
-			// 
-			this.MessageStatusLabel.Name = "MessageStatusLabel";
-			this.MessageStatusLabel.Size = new System.Drawing.Size(105, 17);
-			this.MessageStatusLabel.Text = "TAStudio engaged";
-			// 
-			// SavingProgressBar
-			// 
-			this.SavingProgressBar.Name = "SavingProgressBar";
-			this.SavingProgressBar.Size = new System.Drawing.Size(100, 16);
-			// 
-			// toolStripStatusLabel2
-			// 
-			this.toolStripStatusLabel2.Name = "toolStripStatusLabel2";
-			this.toolStripStatusLabel2.Size = new System.Drawing.Size(112, 17);
-			this.toolStripStatusLabel2.Spring = true;
-			// 
-			// SplicerStatusLabel
-			// 
-			this.SplicerStatusLabel.Name = "SplicerStatusLabel";
-			this.SplicerStatusLabel.Padding = new System.Windows.Forms.Padding(20, 0, 0, 0);
-			this.SplicerStatusLabel.Size = new System.Drawing.Size(175, 17);
-			this.SplicerStatusLabel.Text = "0 selected, clipboard: empty";
-			// 
-			// TasPlaybackBox
-			// 
-			this.TasPlaybackBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.TasPlaybackBox.Location = new System.Drawing.Point(3, 4);
-			this.TasPlaybackBox.Name = "TasPlaybackBox";
-			this.TasPlaybackBox.Size = new System.Drawing.Size(204, 92);
-			this.TasPlaybackBox.TabIndex = 5;
-			this.TasPlaybackBox.Tastudio = null;
-			// 
-			// MarkerControl
-			// 
-			this.MarkerControl.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.MarkerControl.ContextMenuStrip = this.MarkerContextMenu;
-			this.MarkerControl.Emulator = null;
-			this.MarkerControl.Location = new System.Drawing.Point(2, 16);
-			this.MarkerControl.Name = "MarkerControl";
-			this.MarkerControl.Size = new System.Drawing.Size(194, 235);
-			this.MarkerControl.TabIndex = 6;
-			this.MarkerControl.Tastudio = null;
-			// 
-			// MarkerContextMenu
-			// 
-			this.MarkerContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.TasStatusStrip.Location = new System.Drawing.Point(0, 554);
+            this.TasStatusStrip.Name = "TasStatusStrip";
+            this.TasStatusStrip.Size = new System.Drawing.Size(509, 22);
+            this.TasStatusStrip.TabIndex = 4;
+            this.TasStatusStrip.Text = "statusStrip1";
+            // 
+            // MessageStatusLabel
+            // 
+            this.MessageStatusLabel.Name = "MessageStatusLabel";
+            this.MessageStatusLabel.Size = new System.Drawing.Size(95, 17);
+            this.MessageStatusLabel.Text = "TAStudio engaged";
+            // 
+            // SavingProgressBar
+            // 
+            this.SavingProgressBar.Name = "SavingProgressBar";
+            this.SavingProgressBar.Size = new System.Drawing.Size(100, 16);
+            // 
+            // toolStripStatusLabel2
+            // 
+            this.toolStripStatusLabel2.Name = "toolStripStatusLabel2";
+            this.toolStripStatusLabel2.Size = new System.Drawing.Size(134, 17);
+            this.toolStripStatusLabel2.Spring = true;
+            // 
+            // SplicerStatusLabel
+            // 
+            this.SplicerStatusLabel.Name = "SplicerStatusLabel";
+            this.SplicerStatusLabel.Padding = new System.Windows.Forms.Padding(20, 0, 0, 0);
+            this.SplicerStatusLabel.Size = new System.Drawing.Size(163, 17);
+            this.SplicerStatusLabel.Text = "0 selected, clipboard: empty";
+            // 
+            // TasPlaybackBox
+            // 
+            this.TasPlaybackBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.TasPlaybackBox.Location = new System.Drawing.Point(3, 4);
+            this.TasPlaybackBox.Name = "TasPlaybackBox";
+            this.TasPlaybackBox.Size = new System.Drawing.Size(204, 92);
+            this.TasPlaybackBox.TabIndex = 5;
+            this.TasPlaybackBox.Tastudio = null;
+            // 
+            // MarkerControl
+            // 
+            this.MarkerControl.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.MarkerControl.ContextMenuStrip = this.MarkerContextMenu;
+            this.MarkerControl.Emulator = null;
+            this.MarkerControl.Location = new System.Drawing.Point(2, 16);
+            this.MarkerControl.Name = "MarkerControl";
+            this.MarkerControl.Size = new System.Drawing.Size(194, 235);
+            this.MarkerControl.TabIndex = 6;
+            this.MarkerControl.Tastudio = null;
+            // 
+            // MarkerContextMenu
+            // 
+            this.MarkerContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ScrollToMarkerToolStripMenuItem,
             this.EditMarkerContextMenuItem,
             this.AddMarkerContextMenuItem,
             this.RemoveMarkerContextMenuItem});
-			this.MarkerContextMenu.Name = "MarkerContextMenu";
-			this.MarkerContextMenu.Size = new System.Drawing.Size(121, 92);
-			this.MarkerContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.MarkerContextMenu_Opening);
-			// 
-			// ScrollToMarkerToolStripMenuItem
-			// 
-			this.ScrollToMarkerToolStripMenuItem.Name = "ScrollToMarkerToolStripMenuItem";
-			this.ScrollToMarkerToolStripMenuItem.Size = new System.Drawing.Size(120, 22);
-			this.ScrollToMarkerToolStripMenuItem.Text = "Scroll To";
-			this.ScrollToMarkerToolStripMenuItem.Click += new System.EventHandler(this.ScrollToMarkerToolStripMenuItem_Click);
-			// 
-			// EditMarkerContextMenuItem
-			// 
-			this.EditMarkerContextMenuItem.Name = "EditMarkerContextMenuItem";
-			this.EditMarkerContextMenuItem.Size = new System.Drawing.Size(120, 22);
-			this.EditMarkerContextMenuItem.Text = "Edit";
-			this.EditMarkerContextMenuItem.Click += new System.EventHandler(this.EditMarkerContextMenuItem_Click);
-			// 
-			// AddMarkerContextMenuItem
-			// 
-			this.AddMarkerContextMenuItem.Name = "AddMarkerContextMenuItem";
-			this.AddMarkerContextMenuItem.Size = new System.Drawing.Size(120, 22);
-			this.AddMarkerContextMenuItem.Text = "Add";
-			this.AddMarkerContextMenuItem.Click += new System.EventHandler(this.AddMarkerContextMenuItem_Click);
-			// 
-			// RemoveMarkerContextMenuItem
-			// 
-			this.RemoveMarkerContextMenuItem.Name = "RemoveMarkerContextMenuItem";
-			this.RemoveMarkerContextMenuItem.Size = new System.Drawing.Size(120, 22);
-			this.RemoveMarkerContextMenuItem.Text = "Remove";
-			this.RemoveMarkerContextMenuItem.Click += new System.EventHandler(this.RemoveMarkerContextMenuItem_Click);
-			// 
-			// RightClickMenu
-			// 
-			this.RightClickMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.MarkerContextMenu.Name = "MarkerContextMenu";
+            this.MarkerContextMenu.Size = new System.Drawing.Size(126, 92);
+            this.MarkerContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.MarkerContextMenu_Opening);
+            // 
+            // ScrollToMarkerToolStripMenuItem
+            // 
+            this.ScrollToMarkerToolStripMenuItem.Name = "ScrollToMarkerToolStripMenuItem";
+            this.ScrollToMarkerToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
+            this.ScrollToMarkerToolStripMenuItem.Text = "Scroll To";
+            this.ScrollToMarkerToolStripMenuItem.Click += new System.EventHandler(this.ScrollToMarkerToolStripMenuItem_Click);
+            // 
+            // EditMarkerContextMenuItem
+            // 
+            this.EditMarkerContextMenuItem.Name = "EditMarkerContextMenuItem";
+            this.EditMarkerContextMenuItem.Size = new System.Drawing.Size(125, 22);
+            this.EditMarkerContextMenuItem.Text = "Edit";
+            this.EditMarkerContextMenuItem.Click += new System.EventHandler(this.EditMarkerContextMenuItem_Click);
+            // 
+            // AddMarkerContextMenuItem
+            // 
+            this.AddMarkerContextMenuItem.Name = "AddMarkerContextMenuItem";
+            this.AddMarkerContextMenuItem.Size = new System.Drawing.Size(125, 22);
+            this.AddMarkerContextMenuItem.Text = "Add";
+            this.AddMarkerContextMenuItem.Click += new System.EventHandler(this.AddMarkerContextMenuItem_Click);
+            // 
+            // RemoveMarkerContextMenuItem
+            // 
+            this.RemoveMarkerContextMenuItem.Name = "RemoveMarkerContextMenuItem";
+            this.RemoveMarkerContextMenuItem.Size = new System.Drawing.Size(125, 22);
+            this.RemoveMarkerContextMenuItem.Text = "Remove";
+            this.RemoveMarkerContextMenuItem.Click += new System.EventHandler(this.RemoveMarkerContextMenuItem_Click);
+            // 
+            // RightClickMenu
+            // 
+            this.RightClickMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.SetMarkersContextMenuItem,
             this.RemoveMarkersContextMenuItem,
             this.toolStripSeparator15,
@@ -1194,291 +1200,335 @@ namespace BizHawk.Client.EmuHawk
             this.StartFromNowSeparator,
             this.StartNewProjectFromNowMenuItem,
             this.StartANewProjectFromSaveRamMenuItem});
-			this.RightClickMenu.Name = "RightClickMenu";
-			this.RightClickMenu.Size = new System.Drawing.Size(273, 458);
-			this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened);
-			// 
-			// SetMarkersContextMenuItem
-			// 
-			this.SetMarkersContextMenuItem.Name = "SetMarkersContextMenuItem";
-			this.SetMarkersContextMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.SetMarkersContextMenuItem.Text = "Set Markers";
-			this.SetMarkersContextMenuItem.Click += new System.EventHandler(this.SetMarkersMenuItem_Click);
-			// 
-			// RemoveMarkersContextMenuItem
-			// 
-			this.RemoveMarkersContextMenuItem.Name = "RemoveMarkersContextMenuItem";
-			this.RemoveMarkersContextMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.RemoveMarkersContextMenuItem.Text = "Remove Markers";
-			this.RemoveMarkersContextMenuItem.Click += new System.EventHandler(this.RemoveMarkersMenuItem_Click);
-			// 
-			// toolStripSeparator15
-			// 
-			this.toolStripSeparator15.Name = "toolStripSeparator15";
-			this.toolStripSeparator15.Size = new System.Drawing.Size(269, 6);
-			// 
-			// DeselectContextMenuItem
-			// 
-			this.DeselectContextMenuItem.Name = "DeselectContextMenuItem";
-			this.DeselectContextMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.DeselectContextMenuItem.Text = "Deselect";
-			this.DeselectContextMenuItem.Click += new System.EventHandler(this.DeselectMenuItem_Click);
-			// 
-			// SelectBetweenMarkersContextMenuItem
-			// 
-			this.SelectBetweenMarkersContextMenuItem.Name = "SelectBetweenMarkersContextMenuItem";
-			this.SelectBetweenMarkersContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
-            | System.Windows.Forms.Keys.A)));
-			this.SelectBetweenMarkersContextMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.SelectBetweenMarkersContextMenuItem.Text = "Select between Markers";
-			this.SelectBetweenMarkersContextMenuItem.Click += new System.EventHandler(this.SelectBetweenMarkersMenuItem_Click);
-			// 
-			// toolStripSeparator16
-			// 
-			this.toolStripSeparator16.Name = "toolStripSeparator16";
-			this.toolStripSeparator16.Size = new System.Drawing.Size(269, 6);
-			// 
-			// UngreenzoneContextMenuItem
-			// 
-			this.UngreenzoneContextMenuItem.Name = "UngreenzoneContextMenuItem";
-			this.UngreenzoneContextMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.UngreenzoneContextMenuItem.Text = "Clear Greenzone";
-			this.UngreenzoneContextMenuItem.Click += new System.EventHandler(this.ClearGreenzoneMenuItem_Click);
-			// 
-			// CancelSeekContextMenuItem
-			// 
-			this.CancelSeekContextMenuItem.Name = "CancelSeekContextMenuItem";
-			this.CancelSeekContextMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.CancelSeekContextMenuItem.Text = "Cancel Seek";
-			this.CancelSeekContextMenuItem.Click += new System.EventHandler(this.CancelSeekContextMenuItem_Click);
-			// 
-			// toolStripSeparator17
-			// 
-			this.toolStripSeparator17.Name = "toolStripSeparator17";
-			this.toolStripSeparator17.Size = new System.Drawing.Size(269, 6);
-			// 
-			// copyToolStripMenuItem
-			// 
-			this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
-			this.copyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+C";
-			this.copyToolStripMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.copyToolStripMenuItem.Text = "Copy";
-			this.copyToolStripMenuItem.Click += new System.EventHandler(this.CopyMenuItem_Click);
-			// 
-			// pasteToolStripMenuItem
-			// 
-			this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
-			this.pasteToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+V";
-			this.pasteToolStripMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.pasteToolStripMenuItem.Text = "Paste";
-			this.pasteToolStripMenuItem.Click += new System.EventHandler(this.PasteMenuItem_Click);
-			// 
-			// pasteInsertToolStripMenuItem
-			// 
-			this.pasteInsertToolStripMenuItem.Name = "pasteInsertToolStripMenuItem";
-			this.pasteInsertToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Shift+V";
-			this.pasteInsertToolStripMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.pasteInsertToolStripMenuItem.Text = "Paste Insert";
-			this.pasteInsertToolStripMenuItem.Click += new System.EventHandler(this.PasteInsertMenuItem_Click);
-			// 
-			// cutToolStripMenuItem
-			// 
-			this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
-			this.cutToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+X";
-			this.cutToolStripMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.cutToolStripMenuItem.Text = "Cut";
-			this.cutToolStripMenuItem.Click += new System.EventHandler(this.CutMenuItem_Click);
-			// 
-			// separateToolStripMenuItem
-			// 
-			this.separateToolStripMenuItem.Name = "separateToolStripMenuItem";
-			this.separateToolStripMenuItem.Size = new System.Drawing.Size(269, 6);
-			// 
-			// ClearContextMenuItem
-			// 
-			this.ClearContextMenuItem.Name = "ClearContextMenuItem";
-			this.ClearContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete)));
-			this.ClearContextMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.ClearContextMenuItem.Text = "Clear";
-			this.ClearContextMenuItem.Click += new System.EventHandler(this.ClearMenuItem_Click);
-			// 
-			// DeleteFramesContextMenuItem
-			// 
-			this.DeleteFramesContextMenuItem.Name = "DeleteFramesContextMenuItem";
-			this.DeleteFramesContextMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete;
-			this.DeleteFramesContextMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.DeleteFramesContextMenuItem.Text = "Delete";
-			this.DeleteFramesContextMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click);
-			// 
-			// CloneContextMenuItem
-			// 
-			this.CloneContextMenuItem.Name = "CloneContextMenuItem";
-			this.CloneContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert)));
-			this.CloneContextMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.CloneContextMenuItem.Text = "Clone";
-			this.CloneContextMenuItem.Click += new System.EventHandler(this.CloneMenuItem_Click);
-			// 
-			// InsertFrameContextMenuItem
-			// 
-			this.InsertFrameContextMenuItem.Name = "InsertFrameContextMenuItem";
-			this.InsertFrameContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
-            | System.Windows.Forms.Keys.Insert)));
-			this.InsertFrameContextMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.InsertFrameContextMenuItem.Text = "Insert";
-			this.InsertFrameContextMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click);
-			// 
-			// InsertNumFramesContextMenuItem
-			// 
-			this.InsertNumFramesContextMenuItem.Name = "InsertNumFramesContextMenuItem";
-			this.InsertNumFramesContextMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Insert;
-			this.InsertNumFramesContextMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.InsertNumFramesContextMenuItem.Text = "Insert # of Frames";
-			this.InsertNumFramesContextMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click);
-			// 
-			// toolStripSeparator18
-			// 
-			this.toolStripSeparator18.Name = "toolStripSeparator18";
-			this.toolStripSeparator18.Size = new System.Drawing.Size(269, 6);
-			// 
-			// TruncateContextMenuItem
-			// 
-			this.TruncateContextMenuItem.Name = "TruncateContextMenuItem";
-			this.TruncateContextMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.TruncateContextMenuItem.Text = "Truncate Movie";
-			this.TruncateContextMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click);
-			// 
-			// BranchContextMenuItem
-			// 
-			this.BranchContextMenuItem.Name = "BranchContextMenuItem";
-			this.BranchContextMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.BranchContextMenuItem.Text = "&Branch";
-			this.BranchContextMenuItem.Click += new System.EventHandler(this.BranchContextMenuItem_Click);
-			// 
-			// StartFromNowSeparator
-			// 
-			this.StartFromNowSeparator.Name = "StartFromNowSeparator";
-			this.StartFromNowSeparator.Size = new System.Drawing.Size(269, 6);
-			// 
-			// StartNewProjectFromNowMenuItem
-			// 
-			this.StartNewProjectFromNowMenuItem.Name = "StartNewProjectFromNowMenuItem";
-			this.StartNewProjectFromNowMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.StartNewProjectFromNowMenuItem.Text = "Start a new project from Here";
-			this.StartNewProjectFromNowMenuItem.Click += new System.EventHandler(this.StartNewProjectFromNowMenuItem_Click);
-			// 
-			// StartANewProjectFromSaveRamMenuItem
-			// 
-			this.StartANewProjectFromSaveRamMenuItem.Name = "StartANewProjectFromSaveRamMenuItem";
-			this.StartANewProjectFromSaveRamMenuItem.Size = new System.Drawing.Size(272, 22);
-			this.StartANewProjectFromSaveRamMenuItem.Text = "Start a new project from SaveRam";
-			this.StartANewProjectFromSaveRamMenuItem.Click += new System.EventHandler(this.StartANewProjectFromSaveRamMenuItem_Click);
-			// 
-			// groupBox1
-			// 
-			this.groupBox1.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.groupBox1.Controls.Add(this.MarkerControl);
-			this.groupBox1.Location = new System.Drawing.Point(-2, 3);
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(204, 257);
-			this.groupBox1.TabIndex = 7;
-			this.groupBox1.TabStop = false;
-			this.groupBox1.Text = "Markers";
-			// 
-			// BookMarkControl
-			// 
-			this.BookMarkControl.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.BookMarkControl.Location = new System.Drawing.Point(-2, 5);
-			this.BookMarkControl.Name = "BookMarkControl";
-			this.BookMarkControl.Size = new System.Drawing.Size(204, 163);
-			this.BookMarkControl.TabIndex = 8;
-			this.BookMarkControl.Tastudio = null;
-			// 
-			// BranchesMarkersSplit
-			// 
-			this.BranchesMarkersSplit.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.BranchesMarkersSplit.Location = new System.Drawing.Point(3, 89);
-			this.BranchesMarkersSplit.Name = "BranchesMarkersSplit";
-			this.BranchesMarkersSplit.Orientation = System.Windows.Forms.Orientation.Horizontal;
-			// 
-			// BranchesMarkersSplit.Panel1
-			// 
-			this.BranchesMarkersSplit.Panel1.Controls.Add(this.BookMarkControl);
-			// 
-			// BranchesMarkersSplit.Panel2
-			// 
-			this.BranchesMarkersSplit.Panel2.Controls.Add(this.groupBox1);
-			this.BranchesMarkersSplit.Size = new System.Drawing.Size(204, 436);
-			this.BranchesMarkersSplit.SplitterDistance = 169;
-			this.BranchesMarkersSplit.TabIndex = 9;
-			this.BranchesMarkersSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.BranchesMarkersSplit_SplitterMoved);
-			// 
-			// MainVertialSplit
-			// 
-			this.MainVertialSplit.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.MainVertialSplit.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-			this.MainVertialSplit.Location = new System.Drawing.Point(2, 23);
-			this.MainVertialSplit.Name = "MainVertialSplit";
-			// 
-			// MainVertialSplit.Panel1
-			// 
-			this.MainVertialSplit.Panel1.Controls.Add(this.TasView);
-			// 
-			// MainVertialSplit.Panel2
-			// 
-			this.MainVertialSplit.Panel2.Controls.Add(this.TasPlaybackBox);
-			this.MainVertialSplit.Panel2.Controls.Add(this.BranchesMarkersSplit);
-			this.MainVertialSplit.Size = new System.Drawing.Size(507, 528);
-			this.MainVertialSplit.SplitterDistance = 295;
-			this.MainVertialSplit.TabIndex = 10;
-			this.MainVertialSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.MainVertialSplit_SplitterMoved);
-			// 
-			// TAStudio
-			// 
-			this.AllowDrop = true;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(509, 576);
-			this.Controls.Add(this.MainVertialSplit);
-			this.Controls.Add(this.TasStatusStrip);
-			this.Controls.Add(this.TASMenu);
-			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-			this.KeyPreview = true;
-			this.MainMenuStrip = this.TASMenu;
-			this.MinimumSize = new System.Drawing.Size(200, 148);
-			this.Name = "TAStudio";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "TAStudio";
-			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Tastudio_Closing);
-			this.Load += new System.EventHandler(this.Tastudio_Load);
-			this.DragDrop += new System.Windows.Forms.DragEventHandler(this.TAStudio_DragDrop);
-			this.DragEnter += new System.Windows.Forms.DragEventHandler(this.TAStudio_DragEnter);
-			this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TAStudio_KeyDown);
-			this.MouseLeave += new System.EventHandler(this.TAStudio_MouseLeave);
-			this.TASMenu.ResumeLayout(false);
-			this.TASMenu.PerformLayout();
-			this.TasStatusStrip.ResumeLayout(false);
-			this.TasStatusStrip.PerformLayout();
-			this.MarkerContextMenu.ResumeLayout(false);
-			this.RightClickMenu.ResumeLayout(false);
-			this.groupBox1.ResumeLayout(false);
-			this.BranchesMarkersSplit.Panel1.ResumeLayout(false);
-			this.BranchesMarkersSplit.Panel2.ResumeLayout(false);
-			((System.ComponentModel.ISupportInitialize)(this.BranchesMarkersSplit)).EndInit();
-			this.BranchesMarkersSplit.ResumeLayout(false);
-			this.MainVertialSplit.Panel1.ResumeLayout(false);
-			this.MainVertialSplit.Panel2.ResumeLayout(false);
-			((System.ComponentModel.ISupportInitialize)(this.MainVertialSplit)).EndInit();
-			this.MainVertialSplit.ResumeLayout(false);
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.RightClickMenu.Name = "RightClickMenu";
+            this.RightClickMenu.Size = new System.Drawing.Size(270, 458);
+            this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened);
+            // 
+            // SetMarkersContextMenuItem
+            // 
+            this.SetMarkersContextMenuItem.Name = "SetMarkersContextMenuItem";
+            this.SetMarkersContextMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.SetMarkersContextMenuItem.Text = "Set Markers";
+            this.SetMarkersContextMenuItem.Click += new System.EventHandler(this.SetMarkersMenuItem_Click);
+            // 
+            // RemoveMarkersContextMenuItem
+            // 
+            this.RemoveMarkersContextMenuItem.Name = "RemoveMarkersContextMenuItem";
+            this.RemoveMarkersContextMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.RemoveMarkersContextMenuItem.Text = "Remove Markers";
+            this.RemoveMarkersContextMenuItem.Click += new System.EventHandler(this.RemoveMarkersMenuItem_Click);
+            // 
+            // toolStripSeparator15
+            // 
+            this.toolStripSeparator15.Name = "toolStripSeparator15";
+            this.toolStripSeparator15.Size = new System.Drawing.Size(266, 6);
+            // 
+            // DeselectContextMenuItem
+            // 
+            this.DeselectContextMenuItem.Name = "DeselectContextMenuItem";
+            this.DeselectContextMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.DeselectContextMenuItem.Text = "Deselect";
+            this.DeselectContextMenuItem.Click += new System.EventHandler(this.DeselectMenuItem_Click);
+            // 
+            // SelectBetweenMarkersContextMenuItem
+            // 
+            this.SelectBetweenMarkersContextMenuItem.Name = "SelectBetweenMarkersContextMenuItem";
+            this.SelectBetweenMarkersContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
+                        | System.Windows.Forms.Keys.A)));
+            this.SelectBetweenMarkersContextMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.SelectBetweenMarkersContextMenuItem.Text = "Select between Markers";
+            this.SelectBetweenMarkersContextMenuItem.Click += new System.EventHandler(this.SelectBetweenMarkersMenuItem_Click);
+            // 
+            // toolStripSeparator16
+            // 
+            this.toolStripSeparator16.Name = "toolStripSeparator16";
+            this.toolStripSeparator16.Size = new System.Drawing.Size(266, 6);
+            // 
+            // UngreenzoneContextMenuItem
+            // 
+            this.UngreenzoneContextMenuItem.Name = "UngreenzoneContextMenuItem";
+            this.UngreenzoneContextMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.UngreenzoneContextMenuItem.Text = "Clear Greenzone";
+            this.UngreenzoneContextMenuItem.Click += new System.EventHandler(this.ClearGreenzoneMenuItem_Click);
+            // 
+            // CancelSeekContextMenuItem
+            // 
+            this.CancelSeekContextMenuItem.Name = "CancelSeekContextMenuItem";
+            this.CancelSeekContextMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.CancelSeekContextMenuItem.Text = "Cancel Seek";
+            this.CancelSeekContextMenuItem.Click += new System.EventHandler(this.CancelSeekContextMenuItem_Click);
+            // 
+            // toolStripSeparator17
+            // 
+            this.toolStripSeparator17.Name = "toolStripSeparator17";
+            this.toolStripSeparator17.Size = new System.Drawing.Size(266, 6);
+            // 
+            // copyToolStripMenuItem
+            // 
+            this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
+            this.copyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+C";
+            this.copyToolStripMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.copyToolStripMenuItem.Text = "Copy";
+            this.copyToolStripMenuItem.Click += new System.EventHandler(this.CopyMenuItem_Click);
+            // 
+            // pasteToolStripMenuItem
+            // 
+            this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
+            this.pasteToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+V";
+            this.pasteToolStripMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.pasteToolStripMenuItem.Text = "Paste";
+            this.pasteToolStripMenuItem.Click += new System.EventHandler(this.PasteMenuItem_Click);
+            // 
+            // pasteInsertToolStripMenuItem
+            // 
+            this.pasteInsertToolStripMenuItem.Name = "pasteInsertToolStripMenuItem";
+            this.pasteInsertToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Shift+V";
+            this.pasteInsertToolStripMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.pasteInsertToolStripMenuItem.Text = "Paste Insert";
+            this.pasteInsertToolStripMenuItem.Click += new System.EventHandler(this.PasteInsertMenuItem_Click);
+            // 
+            // cutToolStripMenuItem
+            // 
+            this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
+            this.cutToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+X";
+            this.cutToolStripMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.cutToolStripMenuItem.Text = "Cut";
+            this.cutToolStripMenuItem.Click += new System.EventHandler(this.CutMenuItem_Click);
+            // 
+            // separateToolStripMenuItem
+            // 
+            this.separateToolStripMenuItem.Name = "separateToolStripMenuItem";
+            this.separateToolStripMenuItem.Size = new System.Drawing.Size(266, 6);
+            // 
+            // ClearContextMenuItem
+            // 
+            this.ClearContextMenuItem.Name = "ClearContextMenuItem";
+            this.ClearContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete)));
+            this.ClearContextMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.ClearContextMenuItem.Text = "Clear";
+            this.ClearContextMenuItem.Click += new System.EventHandler(this.ClearMenuItem_Click);
+            // 
+            // DeleteFramesContextMenuItem
+            // 
+            this.DeleteFramesContextMenuItem.Name = "DeleteFramesContextMenuItem";
+            this.DeleteFramesContextMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete;
+            this.DeleteFramesContextMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.DeleteFramesContextMenuItem.Text = "Delete";
+            this.DeleteFramesContextMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click);
+            // 
+            // CloneContextMenuItem
+            // 
+            this.CloneContextMenuItem.Name = "CloneContextMenuItem";
+            this.CloneContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert)));
+            this.CloneContextMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.CloneContextMenuItem.Text = "Clone";
+            this.CloneContextMenuItem.Click += new System.EventHandler(this.CloneMenuItem_Click);
+            // 
+            // InsertFrameContextMenuItem
+            // 
+            this.InsertFrameContextMenuItem.Name = "InsertFrameContextMenuItem";
+            this.InsertFrameContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
+                        | System.Windows.Forms.Keys.Insert)));
+            this.InsertFrameContextMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.InsertFrameContextMenuItem.Text = "Insert";
+            this.InsertFrameContextMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click);
+            // 
+            // InsertNumFramesContextMenuItem
+            // 
+            this.InsertNumFramesContextMenuItem.Name = "InsertNumFramesContextMenuItem";
+            this.InsertNumFramesContextMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Insert;
+            this.InsertNumFramesContextMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.InsertNumFramesContextMenuItem.Text = "Insert # of Frames";
+            this.InsertNumFramesContextMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click);
+            // 
+            // toolStripSeparator18
+            // 
+            this.toolStripSeparator18.Name = "toolStripSeparator18";
+            this.toolStripSeparator18.Size = new System.Drawing.Size(266, 6);
+            // 
+            // TruncateContextMenuItem
+            // 
+            this.TruncateContextMenuItem.Name = "TruncateContextMenuItem";
+            this.TruncateContextMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.TruncateContextMenuItem.Text = "Truncate Movie";
+            this.TruncateContextMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click);
+            // 
+            // BranchContextMenuItem
+            // 
+            this.BranchContextMenuItem.Name = "BranchContextMenuItem";
+            this.BranchContextMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.BranchContextMenuItem.Text = "&Branch";
+            this.BranchContextMenuItem.Click += new System.EventHandler(this.BranchContextMenuItem_Click);
+            // 
+            // StartFromNowSeparator
+            // 
+            this.StartFromNowSeparator.Name = "StartFromNowSeparator";
+            this.StartFromNowSeparator.Size = new System.Drawing.Size(266, 6);
+            // 
+            // StartNewProjectFromNowMenuItem
+            // 
+            this.StartNewProjectFromNowMenuItem.Name = "StartNewProjectFromNowMenuItem";
+            this.StartNewProjectFromNowMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.StartNewProjectFromNowMenuItem.Text = "Start a new project from Here";
+            this.StartNewProjectFromNowMenuItem.Click += new System.EventHandler(this.StartNewProjectFromNowMenuItem_Click);
+            // 
+            // StartANewProjectFromSaveRamMenuItem
+            // 
+            this.StartANewProjectFromSaveRamMenuItem.Name = "StartANewProjectFromSaveRamMenuItem";
+            this.StartANewProjectFromSaveRamMenuItem.Size = new System.Drawing.Size(269, 22);
+            this.StartANewProjectFromSaveRamMenuItem.Text = "Start a new project from SaveRam";
+            this.StartANewProjectFromSaveRamMenuItem.Click += new System.EventHandler(this.StartANewProjectFromSaveRamMenuItem_Click);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.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.groupBox1.Controls.Add(this.MarkerControl);
+            this.groupBox1.Location = new System.Drawing.Point(-2, 3);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(204, 257);
+            this.groupBox1.TabIndex = 7;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Markers";
+            // 
+            // BookMarkControl
+            // 
+            this.BookMarkControl.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.BookMarkControl.Location = new System.Drawing.Point(-2, 5);
+            this.BookMarkControl.Name = "BookMarkControl";
+            this.BookMarkControl.Size = new System.Drawing.Size(204, 163);
+            this.BookMarkControl.TabIndex = 8;
+            this.BookMarkControl.Tastudio = null;
+            // 
+            // BranchesMarkersSplit
+            // 
+            this.BranchesMarkersSplit.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.BranchesMarkersSplit.Location = new System.Drawing.Point(3, 89);
+            this.BranchesMarkersSplit.Name = "BranchesMarkersSplit";
+            this.BranchesMarkersSplit.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // BranchesMarkersSplit.Panel1
+            // 
+            this.BranchesMarkersSplit.Panel1.Controls.Add(this.BookMarkControl);
+            // 
+            // BranchesMarkersSplit.Panel2
+            // 
+            this.BranchesMarkersSplit.Panel2.Controls.Add(this.groupBox1);
+            this.BranchesMarkersSplit.Size = new System.Drawing.Size(204, 436);
+            this.BranchesMarkersSplit.SplitterDistance = 169;
+            this.BranchesMarkersSplit.TabIndex = 9;
+            this.BranchesMarkersSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.BranchesMarkersSplit_SplitterMoved);
+            // 
+            // MainVertialSplit
+            // 
+            this.MainVertialSplit.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.MainVertialSplit.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.MainVertialSplit.Location = new System.Drawing.Point(2, 23);
+            this.MainVertialSplit.Name = "MainVertialSplit";
+            // 
+            // MainVertialSplit.Panel1
+            // 
+            this.MainVertialSplit.Panel1.Controls.Add(this.TasView);
+            // 
+            // MainVertialSplit.Panel2
+            // 
+            this.MainVertialSplit.Panel2.Controls.Add(this.TasPlaybackBox);
+            this.MainVertialSplit.Panel2.Controls.Add(this.BranchesMarkersSplit);
+            this.MainVertialSplit.Size = new System.Drawing.Size(507, 528);
+            this.MainVertialSplit.SplitterDistance = 295;
+            this.MainVertialSplit.TabIndex = 10;
+            this.MainVertialSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.MainVertialSplit_SplitterMoved);
+            // 
+            // iconsToolStripMenuItem
+            // 
+            this.iconsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.denoteStatesWithIconsToolStripMenuItem,
+            this.denoteStatesWithBGColorToolStripMenuItem,
+            this.denoteMarkersWithIconsToolStripMenuItem,
+            this.denoteMarkersWithBGColorToolStripMenuItem});
+            this.iconsToolStripMenuItem.Name = "iconsToolStripMenuItem";
+            this.iconsToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
+            this.iconsToolStripMenuItem.Text = "Icons";
+            this.iconsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.iconsToolStripMenuItem_DropDownOpened);
+            // 
+            // denoteStatesWithIconsToolStripMenuItem
+            // 
+            this.denoteStatesWithIconsToolStripMenuItem.CheckOnClick = true;
+            this.denoteStatesWithIconsToolStripMenuItem.Name = "denoteStatesWithIconsToolStripMenuItem";
+            this.denoteStatesWithIconsToolStripMenuItem.Size = new System.Drawing.Size(208, 22);
+            this.denoteStatesWithIconsToolStripMenuItem.Text = "Denote States With Icons";
+            this.denoteStatesWithIconsToolStripMenuItem.Click += new System.EventHandler(this.denoteStatesWithIconsToolStripMenuItem_Click);
+            // 
+            // denoteStatesWithBGColorToolStripMenuItem
+            // 
+            this.denoteStatesWithBGColorToolStripMenuItem.CheckOnClick = true;
+            this.denoteStatesWithBGColorToolStripMenuItem.Name = "denoteStatesWithBGColorToolStripMenuItem";
+            this.denoteStatesWithBGColorToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
+            this.denoteStatesWithBGColorToolStripMenuItem.Text = "Denote States With BG Color";
+            this.denoteStatesWithBGColorToolStripMenuItem.Click += new System.EventHandler(this.denoteStatesWithBGColorToolStripMenuItem_Click);
+            // 
+            // denoteMarkersWithIconsToolStripMenuItem
+            // 
+            this.denoteMarkersWithIconsToolStripMenuItem.CheckOnClick = true;
+            this.denoteMarkersWithIconsToolStripMenuItem.Name = "denoteMarkersWithIconsToolStripMenuItem";
+            this.denoteMarkersWithIconsToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
+            this.denoteMarkersWithIconsToolStripMenuItem.Text = "Denote Markers With Icons";
+            this.denoteMarkersWithIconsToolStripMenuItem.Click += new System.EventHandler(this.denoteMarkersWithIconsToolStripMenuItem_Click);
+            // 
+            // denoteMarkersWithBGColorToolStripMenuItem
+            // 
+            this.denoteMarkersWithBGColorToolStripMenuItem.CheckOnClick = true;
+            this.denoteMarkersWithBGColorToolStripMenuItem.Name = "denoteMarkersWithBGColorToolStripMenuItem";
+            this.denoteMarkersWithBGColorToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
+            this.denoteMarkersWithBGColorToolStripMenuItem.Text = "Denote Markers With BG Color";
+            this.denoteMarkersWithBGColorToolStripMenuItem.Click += new System.EventHandler(this.denoteMarkersWithBGColorToolStripMenuItem_Click);
+            // 
+            // TAStudio
+            // 
+            this.AllowDrop = true;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(509, 576);
+            this.Controls.Add(this.MainVertialSplit);
+            this.Controls.Add(this.TasStatusStrip);
+            this.Controls.Add(this.TASMenu);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.KeyPreview = true;
+            this.MainMenuStrip = this.TASMenu;
+            this.MinimumSize = new System.Drawing.Size(200, 148);
+            this.Name = "TAStudio";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "TAStudio";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Tastudio_Closing);
+            this.Load += new System.EventHandler(this.Tastudio_Load);
+            this.DragDrop += new System.Windows.Forms.DragEventHandler(this.TAStudio_DragDrop);
+            this.DragEnter += new System.Windows.Forms.DragEventHandler(this.TAStudio_DragEnter);
+            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TAStudio_KeyDown);
+            this.MouseLeave += new System.EventHandler(this.TAStudio_MouseLeave);
+            this.TASMenu.ResumeLayout(false);
+            this.TASMenu.PerformLayout();
+            this.TasStatusStrip.ResumeLayout(false);
+            this.TasStatusStrip.PerformLayout();
+            this.MarkerContextMenu.ResumeLayout(false);
+            this.RightClickMenu.ResumeLayout(false);
+            this.groupBox1.ResumeLayout(false);
+            this.BranchesMarkersSplit.Panel1.ResumeLayout(false);
+            this.BranchesMarkersSplit.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.BranchesMarkersSplit)).EndInit();
+            this.BranchesMarkersSplit.ResumeLayout(false);
+            this.MainVertialSplit.Panel1.ResumeLayout(false);
+            this.MainVertialSplit.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.MainVertialSplit)).EndInit();
+            this.MainVertialSplit.ResumeLayout(false);
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
 		}
 
@@ -1629,5 +1679,10 @@ namespace BizHawk.Client.EmuHawk
 		private System.Windows.Forms.SplitContainer BranchesMarkersSplit;
 		private System.Windows.Forms.SplitContainer MainVertialSplit;
 		private System.Windows.Forms.ToolStripMenuItem StartANewProjectFromSaveRamMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem iconsToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem denoteStatesWithIconsToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem denoteStatesWithBGColorToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem denoteMarkersWithIconsToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem denoteMarkersWithBGColorToolStripMenuItem;
 	}
 }
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index 7a8a90b94e..74219f9a5b 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -119,14 +119,20 @@ namespace BizHawk.Client.EmuHawk
 						Properties.Resources.ts_h_arrow_green;
 				}
 			}
-			else if (columnName == FrameColumnName && VersionInfo.DeveloperBuild)
+			else if (columnName == FrameColumnName)
 			{
 				TasMovieRecord record = CurrentTasMovie[index];
-				if (record.HasState)
+				offsetX = -3;
+				offsetY = 1;
+
+                if (CurrentTasMovie.Markers.IsMarker(index) && TasView.denoteMarkersWithIcons)
+                    bitmap = Properties.Resources.icon_marker;
+                else if (record.HasState && TasView.denoteStatesWithIcons)
 				{
-					offsetX = -2;
-					offsetY = 2;
-					bitmap = Properties.Resources.anchor;
+                    if (record.Lagged.HasValue && record.Lagged.Value)
+                        bitmap = Properties.Resources.icon_anchor_lag;
+                    else
+                        bitmap = Properties.Resources.icon_anchor;
 				}
 			}
 		}
@@ -148,7 +154,7 @@ namespace BizHawk.Client.EmuHawk
             
 			if (columnName == FrameColumnName)
 			{
-				if (Emulator.Frame != index && CurrentTasMovie.Markers.IsMarker(index))
+				if (Emulator.Frame != index && CurrentTasMovie.Markers.IsMarker(index) && TasView.denoteMarkersWithBGColor)
 					color = Marker_FrameCol;
                 else
                     color = Color.FromArgb(0x60FFFFFF);
@@ -160,7 +166,7 @@ namespace BizHawk.Client.EmuHawk
 
 			int player = Global.Emulator.ControllerDefinition.PlayerNumber(columnName);
 			if (player != 0 && player % 2 == 0)
-				color = Color.FromArgb(0x0C000000);
+				color = Color.FromArgb(0x0D000000);
 		}
 		private void TasView_QueryRowBkColor(int index, ref Color color)
 		{
@@ -172,14 +178,14 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else if (record.Lagged.HasValue)
 			{
-                if (CurrentTasMovie.TasStateManager.HasState(index))
-				    color = record.Lagged.Value ?
-					    LagZone_InputLog_Stated :
-                        GreenZone_InputLog_Stated;
-                else
+                if (!CurrentTasMovie.TasStateManager.HasState(index) && TasView.denoteStatesWithBGColor)
                     color = record.Lagged.Value ?
                         LagZone_InputLog :
                         GreenZone_InputLog;
+                else
+				    color = record.Lagged.Value ?
+					    LagZone_InputLog_Stated :
+                        GreenZone_InputLog_Stated;
 			}
 			else if (record.WasLagged.HasValue)
 			{
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
index cbd11ea4b9..bbcc475043 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
@@ -834,7 +834,39 @@ namespace BizHawk.Client.EmuHawk
 		private void scrollToCenterToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			TasView.ScrollMethod = Settings.FollowCursorScrollMethod = "center";
-		}
+        }
+
+        private void iconsToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
+        {
+            denoteStatesWithIconsToolStripMenuItem.Checked = Settings.denoteStatesWithIcons;
+            denoteStatesWithBGColorToolStripMenuItem.Checked = Settings.denoteStatesWithBGColor;
+            denoteMarkersWithIconsToolStripMenuItem.Checked = Settings.denoteMarkersWithIcons;
+            denoteMarkersWithBGColorToolStripMenuItem.Checked = Settings.denoteMarkersWithBGColor;
+        }
+
+        private void denoteStatesWithIconsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            TasView.denoteStatesWithIcons = Settings.denoteStatesWithIcons = denoteStatesWithIconsToolStripMenuItem.Checked;
+            RefreshDialog();
+        }
+
+        private void denoteStatesWithBGColorToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            TasView.denoteStatesWithBGColor = Settings.denoteStatesWithBGColor = denoteStatesWithBGColorToolStripMenuItem.Checked;
+            RefreshDialog();
+        }
+
+        private void denoteMarkersWithIconsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            TasView.denoteMarkersWithIcons = Settings.denoteMarkersWithIcons = denoteMarkersWithIconsToolStripMenuItem.Checked;
+            RefreshDialog();
+        }
+
+        private void denoteMarkersWithBGColorToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            TasView.denoteMarkersWithBGColor = Settings.denoteMarkersWithBGColor = denoteMarkersWithBGColorToolStripMenuItem.Checked;
+            RefreshDialog();
+        }
 
 		private void followCursorToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
 		{
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 84ed35f5b6..ddb3de569a 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -61,6 +61,11 @@ namespace BizHawk.Client.EmuHawk
 				ScrollSpeed = 1;
 				FollowCursorAlwaysScroll = false;
 				FollowCursorScrollMethod = "near";
+                // default to taseditor fashion
+                denoteStatesWithIcons = false;
+                denoteStatesWithBGColor = true;
+                denoteMarkersWithIcons = false;
+                denoteMarkersWithBGColor = true;
 			}
 
 			public RecentFiles RecentTas { get; set; }
@@ -71,7 +76,12 @@ namespace BizHawk.Client.EmuHawk
 			public bool EmptyMarkers { get; set; }
 			public int ScrollSpeed { get; set; }
 			public bool FollowCursorAlwaysScroll { get; set; }
-			public string FollowCursorScrollMethod { get; set; }
+            public string FollowCursorScrollMethod { get; set; }
+
+            public bool denoteStatesWithIcons { get; set; }
+            public bool denoteStatesWithBGColor { get; set; }
+            public bool denoteMarkersWithIcons { get; set; }
+            public bool denoteMarkersWithBGColor { get; set; }
 
 			public int MainVerticalSplitDistance { get; set; }
 			public int BranchMarkerSplitDistance { get; set; }
@@ -193,7 +203,12 @@ namespace BizHawk.Client.EmuHawk
 			TasView.InputPaintingMode = Settings.DrawInput;
 			TasView.ScrollSpeed = Settings.ScrollSpeed;
 			TasView.AlwaysScroll = Settings.FollowCursorAlwaysScroll;
-			TasView.ScrollMethod = Settings.FollowCursorScrollMethod;
+            TasView.ScrollMethod = Settings.FollowCursorScrollMethod;
+
+            TasView.denoteStatesWithIcons = Settings.denoteStatesWithIcons;
+            TasView.denoteStatesWithBGColor = Settings.denoteStatesWithBGColor;
+            TasView.denoteMarkersWithIcons = Settings.denoteMarkersWithIcons;
+            TasView.denoteMarkersWithBGColor = Settings.denoteMarkersWithBGColor;
 
 			// Remembering Split container logic
 			int defaultMainSplitDistance = MainVertialSplit.SplitterDistance;
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.resx b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.resx
index 01148f7104..e38ea4078a 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.resx
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.resx
@@ -123,62 +123,19 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="RecentSubMenu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
-        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
-        bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE
-        sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs
-        AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4
-        JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR
-        3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd
-        li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF
-        ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX
-        wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF
-        hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55
-        4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ
-        VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB
-        5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC
-        qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE
-        j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I
-        1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9
-        rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG
-        fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp
-        B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ
-        yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC
-        YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln
-        yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v
-        vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp
-        vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L
-        Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA
-        bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z
-        llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW
-        ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s
-        xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6
-        eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw
-        YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR
-        XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm
-        WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl
-        xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2
-        dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8
-        V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za
-        Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v
-        Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb
-        PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/
-        0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h
-        /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr
-        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
-        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
-        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAk1JREFUOE+VkktvUlEU
-        hVsfsdHoREcOHJr4C/RPONHoXzBxoOlAJybOlAZtkdSa2piYNsjjFiiX8qY8ChYL+ECB2lKB8rq0k5bE
-        miiRbtc+6b2B6MTBR/ZZa+919j3tEBH9RbudHD6E63/2qAwctreT58BVRVnWl8vBbLEg7wNC/QPaMrwb
-        4GT/jFa024mzQLe56c9GwjM7klXXlcw6ksyPSbLoKByc/lUq+TbQMwrODARAGAF3SxtexSMbf8vOCVp9
-        ZyK+/euaW9TO+SfksOlprSjvoteAjU5rAYqSuFyvR1PR8EwvGJii8rcAoYFSb+d4gDAgNI/8jGTHOFUr
-        oT3410QAHuk4Am4Vi/KOzz2JGxfFcLMZI3wK5T7ZqaXEhcYbWU2PKJM2H7Ra8XE14AQO91dTpk4k9JLq
-        9YgYHghoxcWZPa/bSCH/C2o0orPaBo1GbDQee9VJxF+zoYFPwtpGWgpN0/uMRWgcyiG1WsSkBhxFwG0E
-        7AV8z2lrKyxuYvgBs2kLr4z1XcLj4SA2gD+nBhxB8p1sxtKZt4xR/otTDNdqS1oQw7ezx2/AfxVok1oA
-        mh+WSt7v/MKLLgOtr3tEQD+sseeyPyX0dqHdVAOGq9XQPazX/JyzH9itY+SQ9LSSnKV8fkHANWvsoYc/
-        JYaZERHAPzicBw9AoZBf+BnwTZEN/4G2N4egZg1eDz05cIHntACmUgmeAtdhRsvlwH6x6Dr4+EESoO5B
-        68JLo+eSOjMQwKDpGLgCJtDoBysgBXzQDOBifz8zcPh/aOgP7nYTiVA2JaoAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCgAA
+        CwoBv0NmUwAAAllJREFUOE+VU8tuUlEUFR+x0ehEB40DhyZ+gQ78BSca/QUTB5oOdGLiTGnQFkmtqY2J
+        aYO8CpRLeVMehRYL+ECB2lKB8qYTS2JNlAjbtU96b2h1IskiZ6+19jr7HA4qIjp08NNuL6v2OCEOD1/5
+        y6MQHCCj3Y6fBa42m0uaYtGfzuekXYCw/gFuCdoN4MRgj9LcasXOAOrNTW86FJzetpjUXYtBTRbDY7IY
+        1RT0T/0qFDwb8IwAp+UQEQBiCLhb2HA3XZLut2Qfp9W3euLdv6w5xdo+94RsZg2t5aVv8Gox0SlxfP5q
+        NmOXqtVwIhyc7vl9k1T86iMYKLE8yw2EBsG5pGck2caoXArsQL8mAlqt+DEE3MrnpW2PcwI7Lojmej1C
+        OAplPlqp0YwKjicy6R9RKmnoNxrRMTngOIr7qwl9JxR4SdVqSDTvC2hERc2a26mjgPcF1WrhGWWCWi0y
+        Eo286sSir1lQgCNhbB0tBqboXcooeJ6KQyqVkF4OOIKA2wjY8Xme09ZWUOzE4AtMJ408MsZ3CI2b/ZgA
+        +qwccBjJd9IpY2fOOErZz3bRXKksKkFc8+6s8R3wrwJuQgmA+WGh4P7ON7zg0NL6uksEDII51hzWpwRv
+        F9pNOUBVLgfuYbz6p4y1bzWNks2ioZX4DGWz8wK8Zo41ePgoEfQMKe8AxTngAZDLZed/+jyTZMYLNL/Z
+        A9bMQevBkwHO73uJXJRK/pPAdYjhYtG3m887+h/eWwSw7oHrQkvCc/Gf/wUmYToKXAbGYfQCK0AC8IDT
+        AhcGm5UjHCT/p/4DPvHsVpirf9UAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="TasStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">