diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index faaa163798..8b43a34046 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -1686,9 +1686,6 @@
     <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" />
     <None Include="images\Cross.png" />
@@ -1993,6 +1990,7 @@
     <None Include="images\ControllerImages\AppleIIKeyboard.png" />
     <None Include="images\BlankCursor.cur" />
     <None Include="images\cdlogger.ico" />
+    <None Include="images\AddEdit.png" />
     <Content Include="images\logo.ico" />
     <None Include="images\Paste.png" />
     <None Include="images\reboot.png" />
diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
index ce125c1389..706b012405 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.42000
+//     Runtime Version:4.0.30319.225
 //
 //     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,13 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
+        internal static System.Drawing.Bitmap AddEdit {
+            get {
+                object obj = ResourceManager.GetObject("AddEdit", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap addWatch {
             get {
                 object obj = ResourceManager.GetObject("addWatch", resourceCulture);
@@ -90,9 +88,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,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 AppleIIKeyboard {
             get {
                 object obj = ResourceManager.GetObject("AppleIIKeyboard", resourceCulture);
@@ -110,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 atari_controller {
             get {
                 object obj = ResourceManager.GetObject("atari_controller", resourceCulture);
@@ -120,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 AudioHS {
             get {
                 object obj = ResourceManager.GetObject("AudioHS", resourceCulture);
@@ -130,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 AutoSearch {
             get {
                 object obj = ResourceManager.GetObject("AutoSearch", resourceCulture);
@@ -140,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 AVI {
             get {
                 object obj = ResourceManager.GetObject("AVI", resourceCulture);
@@ -150,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 Back {
             get {
                 object obj = ResourceManager.GetObject("Back", resourceCulture);
@@ -160,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 BackMore {
             get {
                 object obj = ResourceManager.GetObject("BackMore", resourceCulture);
@@ -170,9 +144,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);
@@ -180,9 +151,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);
@@ -190,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 BlueDown {
             get {
                 object obj = ResourceManager.GetObject("BlueDown", resourceCulture);
@@ -200,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 BlueUp {
             get {
                 object obj = ResourceManager.GetObject("BlueUp", resourceCulture);
@@ -210,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 Both {
             get {
                 object obj = ResourceManager.GetObject("Both", resourceCulture);
@@ -220,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 bsnes {
             get {
                 object obj = ResourceManager.GetObject("bsnes", resourceCulture);
@@ -230,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 Bug {
             get {
                 object obj = ResourceManager.GetObject("Bug", resourceCulture);
@@ -240,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 C64Joystick {
             get {
                 object obj = ResourceManager.GetObject("C64Joystick", resourceCulture);
@@ -250,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 C64Keyboard {
             get {
                 object obj = ResourceManager.GetObject("C64Keyboard", resourceCulture);
@@ -260,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 C64Symbol {
             get {
                 object obj = ResourceManager.GetObject("C64Symbol", resourceCulture);
@@ -270,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 calculator {
             get {
                 object obj = ResourceManager.GetObject("calculator", resourceCulture);
@@ -280,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 camera {
             get {
                 object obj = ResourceManager.GetObject("camera", resourceCulture);
@@ -290,9 +228,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap cdlogger {
             get {
                 object obj = ResourceManager.GetObject("cdlogger", resourceCulture);
@@ -300,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 cheat {
             get {
                 object obj = ResourceManager.GetObject("cheat", resourceCulture);
@@ -310,9 +242,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 +249,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 +256,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 +263,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 +270,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 +277,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 +284,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 +291,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 +298,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 +305,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 +312,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 +319,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 +326,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 +333,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 +340,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 +347,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 +354,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 +361,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 +368,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 +375,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 +382,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 +389,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 +396,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 +403,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 +410,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 +417,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 +424,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 +431,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 +438,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 +445,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 +452,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 +459,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 +466,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 +473,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 +480,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 +487,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 +494,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 +501,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 +508,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 +515,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 +522,6 @@ 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);
@@ -720,9 +529,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap icon_anchor_lag {
             get {
                 object obj = ResourceManager.GetObject("icon_anchor_lag", resourceCulture);
@@ -730,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 icon_marker {
             get {
                 object obj = ResourceManager.GetObject("icon_marker", resourceCulture);
@@ -740,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 Import {
             get {
                 object obj = ResourceManager.GetObject("Import", resourceCulture);
@@ -750,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 InsertSeparator {
             get {
                 object obj = ResourceManager.GetObject("InsertSeparator", resourceCulture);
@@ -760,9 +557,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);
@@ -770,9 +564,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);
@@ -780,9 +571,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Lightning {
             get {
                 object obj = ResourceManager.GetObject("Lightning", resourceCulture);
@@ -790,9 +578,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);
@@ -800,9 +585,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);
@@ -810,9 +592,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);
@@ -820,9 +599,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);
@@ -830,9 +606,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);
@@ -840,9 +613,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);
@@ -850,9 +620,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);
@@ -860,9 +627,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);
@@ -870,9 +634,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);
@@ -880,9 +641,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);
@@ -890,9 +648,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);
@@ -900,9 +655,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);
@@ -910,9 +662,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);
@@ -920,9 +669,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);
@@ -930,9 +676,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);
@@ -940,9 +683,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);
@@ -950,9 +690,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);
@@ -960,9 +697,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);
@@ -970,18 +704,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);
@@ -989,9 +717,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);
@@ -999,9 +724,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);
@@ -1009,9 +731,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);
@@ -1019,9 +738,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);
@@ -1029,9 +745,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);
@@ -1039,9 +752,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);
@@ -1049,9 +759,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);
@@ -1059,9 +766,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);
@@ -1069,9 +773,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);
@@ -1079,9 +780,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);
@@ -1089,9 +787,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);
@@ -1099,9 +794,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);
@@ -1109,9 +801,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);
@@ -1119,9 +808,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);
@@ -1129,9 +815,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);
@@ -1139,9 +822,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);
@@ -1149,9 +829,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);
@@ -1159,9 +836,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);
@@ -1169,9 +843,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);
@@ -1179,9 +850,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);
@@ -1189,9 +857,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);
@@ -1199,9 +864,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);
@@ -1209,9 +871,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);
@@ -1219,9 +878,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);
@@ -1229,9 +885,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);
@@ -1239,9 +892,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);
@@ -1249,9 +899,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);
@@ -1259,9 +906,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);
@@ -1269,9 +913,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);
@@ -1279,9 +920,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);
@@ -1289,9 +927,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);
@@ -1299,9 +934,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);
@@ -1309,9 +941,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);
@@ -1319,9 +948,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);
@@ -1329,9 +955,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);
@@ -1339,9 +962,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);
@@ -1349,9 +969,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);
@@ -1359,9 +976,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);
@@ -1369,9 +983,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);
@@ -1379,9 +990,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);
@@ -1389,9 +997,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);
@@ -1399,9 +1004,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);
@@ -1409,9 +1011,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);
@@ -1419,9 +1018,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);
@@ -1429,9 +1025,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);
@@ -1439,9 +1032,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);
@@ -1449,9 +1039,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);
@@ -1459,9 +1046,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);
@@ -1469,9 +1053,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);
@@ -1479,9 +1060,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);
@@ -1489,9 +1067,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);
@@ -1499,9 +1074,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);
@@ -1509,9 +1081,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);
@@ -1519,9 +1088,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);
@@ -1529,9 +1095,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);
@@ -1539,9 +1102,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);
@@ -1549,9 +1109,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);
@@ -1559,9 +1116,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);
@@ -1569,9 +1123,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);
@@ -1579,9 +1130,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);
@@ -1589,9 +1137,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);
@@ -1599,9 +1144,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);
@@ -1609,9 +1151,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);
@@ -1619,9 +1158,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);
@@ -1629,9 +1165,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);
@@ -1639,9 +1172,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);
@@ -1649,9 +1179,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);
@@ -1659,9 +1186,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);
@@ -1669,9 +1193,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);
@@ -1679,9 +1200,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);
@@ -1689,9 +1207,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);
@@ -1699,9 +1214,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);
@@ -1709,9 +1221,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);
@@ -1719,9 +1228,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);
@@ -1729,9 +1235,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);
@@ -1739,9 +1242,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);
@@ -1749,9 +1249,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);
@@ -1759,9 +1256,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);
@@ -1769,9 +1263,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);
@@ -1779,9 +1270,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);
@@ -1789,9 +1277,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);
@@ -1799,9 +1284,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);
@@ -1809,9 +1291,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);
@@ -1819,9 +1298,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);
@@ -1829,9 +1305,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);
@@ -1839,9 +1312,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);
@@ -1849,9 +1319,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);
@@ -1859,9 +1326,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);
@@ -1869,9 +1333,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);
@@ -1879,9 +1340,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);
@@ -1889,9 +1347,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);
@@ -1899,9 +1354,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);
@@ -1909,9 +1361,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);
@@ -1919,9 +1368,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);
@@ -1929,9 +1375,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);
@@ -1939,9 +1382,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);
@@ -1949,9 +1389,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);
@@ -1959,9 +1396,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);
@@ -1969,9 +1403,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);
@@ -1979,9 +1410,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);
@@ -1989,9 +1417,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);
@@ -1999,9 +1424,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);
@@ -2009,9 +1431,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);
@@ -2019,9 +1438,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);
@@ -2029,9 +1445,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);
@@ -2039,9 +1452,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);
@@ -2049,9 +1459,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);
@@ -2059,9 +1466,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);
@@ -2069,9 +1473,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);
@@ -2079,9 +1480,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);
@@ -2089,9 +1487,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);
@@ -2099,9 +1494,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);
@@ -2109,9 +1501,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);
@@ -2119,9 +1508,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);
@@ -2129,9 +1515,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);
@@ -2139,9 +1522,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);
@@ -2149,9 +1529,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);
@@ -2159,9 +1536,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);
@@ -2169,9 +1543,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);
@@ -2179,9 +1550,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);
@@ -2189,9 +1557,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);
@@ -2199,9 +1564,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);
@@ -2209,9 +1571,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);
@@ -2219,9 +1578,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);
@@ -2229,9 +1585,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);
@@ -2239,9 +1592,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);
@@ -2249,9 +1599,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);
@@ -2259,9 +1606,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);
@@ -2269,9 +1613,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);
@@ -2279,9 +1620,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);
@@ -2289,9 +1627,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);
@@ -2299,9 +1634,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);
@@ -2309,9 +1641,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);
@@ -2319,9 +1648,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);
@@ -2329,9 +1655,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);
@@ -2339,9 +1662,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);
@@ -2349,9 +1669,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);
@@ -2359,9 +1676,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);
@@ -2369,9 +1683,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);
@@ -2379,9 +1690,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);
@@ -2389,9 +1697,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);
@@ -2399,9 +1704,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);
@@ -2409,9 +1711,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);
@@ -2419,9 +1718,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);
@@ -2429,9 +1725,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);
@@ -2439,9 +1732,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);
@@ -2449,9 +1739,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);
@@ -2459,9 +1746,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);
@@ -2469,9 +1753,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);
@@ -2479,9 +1760,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);
@@ -2489,9 +1767,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);
@@ -2499,9 +1774,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);
@@ -2509,9 +1781,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);
@@ -2519,9 +1788,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);
@@ -2529,9 +1795,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);
@@ -2539,9 +1802,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);
@@ -2549,9 +1809,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);
@@ -2559,9 +1816,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);
@@ -2569,9 +1823,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);
@@ -2579,9 +1830,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);
@@ -2589,9 +1837,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);
@@ -2599,9 +1844,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);
@@ -2609,9 +1851,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);
@@ -2619,9 +1858,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);
@@ -2629,9 +1865,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);
@@ -2639,9 +1872,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);
@@ -2649,9 +1879,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);
@@ -2659,9 +1886,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);
@@ -2669,9 +1893,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);
@@ -2679,9 +1900,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);
@@ -2689,9 +1907,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);
@@ -2699,9 +1914,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);
@@ -2709,9 +1921,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);
@@ -2719,9 +1928,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);
@@ -2729,9 +1935,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);
@@ -2739,9 +1942,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);
@@ -2749,9 +1949,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);
@@ -2759,9 +1956,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);
@@ -2769,9 +1963,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);
@@ -2779,9 +1970,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);
@@ -2789,9 +1977,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);
@@ -2799,9 +1984,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);
@@ -2809,9 +1991,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);
@@ -2819,9 +1998,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);
@@ -2829,9 +2005,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);
@@ -2839,9 +2012,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);
@@ -2849,9 +2019,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);
@@ -2859,9 +2026,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);
@@ -2869,9 +2033,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);
@@ -2879,9 +2040,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);
@@ -2889,9 +2047,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);
@@ -2899,9 +2054,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);
@@ -2909,9 +2061,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);
@@ -2919,9 +2068,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);
@@ -2929,9 +2075,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);
@@ -2939,9 +2082,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);
@@ -2949,9 +2089,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);
@@ -2959,9 +2096,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);
@@ -2969,9 +2103,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);
@@ -2979,9 +2110,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);
@@ -2989,9 +2117,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);
@@ -2999,9 +2124,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);
@@ -3009,9 +2131,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);
@@ -3019,9 +2138,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);
@@ -3029,9 +2145,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);
@@ -3039,9 +2152,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);
@@ -3049,9 +2159,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);
@@ -3059,9 +2166,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);
@@ -3069,9 +2173,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);
@@ -3079,9 +2180,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);
@@ -3089,9 +2187,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);
@@ -3099,9 +2194,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);
@@ -3109,9 +2201,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);
@@ -3119,9 +2208,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);
@@ -3129,9 +2215,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);
@@ -3139,9 +2222,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);
@@ -3149,9 +2229,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);
@@ -3159,9 +2236,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);
@@ -3169,9 +2243,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);
@@ -3179,9 +2250,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);
@@ -3189,9 +2257,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);
@@ -3199,9 +2264,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);
@@ -3209,9 +2271,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);
@@ -3219,9 +2278,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);
@@ -3229,9 +2285,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);
@@ -3239,9 +2292,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);
@@ -3249,9 +2299,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);
@@ -3259,9 +2306,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);
@@ -3269,9 +2313,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);
@@ -3279,9 +2320,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 98a5f2cd98..5f88f86e62 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.resx
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx
@@ -1512,4 +1512,7 @@
   <data name="cdlogger" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\cdlogger.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="AddEdit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\AddEdit.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/AddEdit.png b/BizHawk.Client.EmuHawk/images/AddEdit.png
new file mode 100644
index 0000000000..73c6ebf990
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/AddEdit.png differ
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs
index 0672d4f17f..5163d6e1c0 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs
@@ -30,15 +30,22 @@
 		{
 			this.components = new System.ComponentModel.Container();
 			this.BookmarksBranchesGroupBox = new System.Windows.Forms.GroupBox();
+			this.RemoveBranchButton = new System.Windows.Forms.Button();
+			this.EditBranchTextButton = new System.Windows.Forms.Button();
+			this.UpdateBranchButton = new System.Windows.Forms.Button();
+			this.AddWithTextBranchButton = new System.Windows.Forms.Button();
+			this.AddBranchButton = new System.Windows.Forms.Button();
+			this.LoadBranchButton = new System.Windows.Forms.Button();
 			this.BranchView = new BizHawk.Client.EmuHawk.InputRoll();
 			this.BranchesContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-			this.LoadBranchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-			this.UpdateBranchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.AddBranchContextMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.AddBranchWithTextContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadBranchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.UpdateBranchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.EditBranchTextContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
 			this.RemoveBranchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.EditBranchTextToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.AddBranchWithTextToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
 			this.BookmarksBranchesGroupBox.SuspendLayout();
 			this.BranchesContextMenu.SuspendLayout();
 			this.SuspendLayout();
@@ -48,14 +55,90 @@
 			this.BookmarksBranchesGroupBox.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.BookmarksBranchesGroupBox.Controls.Add(this.RemoveBranchButton);
+			this.BookmarksBranchesGroupBox.Controls.Add(this.EditBranchTextButton);
+			this.BookmarksBranchesGroupBox.Controls.Add(this.UpdateBranchButton);
+			this.BookmarksBranchesGroupBox.Controls.Add(this.AddWithTextBranchButton);
+			this.BookmarksBranchesGroupBox.Controls.Add(this.AddBranchButton);
+			this.BookmarksBranchesGroupBox.Controls.Add(this.LoadBranchButton);
 			this.BookmarksBranchesGroupBox.Controls.Add(this.BranchView);
 			this.BookmarksBranchesGroupBox.Location = new System.Drawing.Point(3, 0);
 			this.BookmarksBranchesGroupBox.Name = "BookmarksBranchesGroupBox";
-			this.BookmarksBranchesGroupBox.Size = new System.Drawing.Size(198, 249);
+			this.BookmarksBranchesGroupBox.Size = new System.Drawing.Size(198, 278);
 			this.BookmarksBranchesGroupBox.TabIndex = 0;
 			this.BookmarksBranchesGroupBox.TabStop = false;
 			this.BookmarksBranchesGroupBox.Text = "Branches";
 			// 
+			// RemoveBranchButton
+			// 
+			this.RemoveBranchButton.Enabled = false;
+			this.RemoveBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
+			this.RemoveBranchButton.Location = new System.Drawing.Point(164, 19);
+			this.RemoveBranchButton.Name = "RemoveBranchButton";
+			this.RemoveBranchButton.Size = new System.Drawing.Size(25, 23);
+			this.RemoveBranchButton.TabIndex = 6;
+			this.toolTip1.SetToolTip(this.RemoveBranchButton, "Remove Branch");
+			this.RemoveBranchButton.UseVisualStyleBackColor = true;
+			this.RemoveBranchButton.Click += new System.EventHandler(this.RemoveBranchToolStripMenuItem_Click);
+			// 
+			// EditBranchTextButton
+			// 
+			this.EditBranchTextButton.Enabled = false;
+			this.EditBranchTextButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil;
+			this.EditBranchTextButton.Location = new System.Drawing.Point(133, 19);
+			this.EditBranchTextButton.Name = "EditBranchTextButton";
+			this.EditBranchTextButton.Size = new System.Drawing.Size(25, 23);
+			this.EditBranchTextButton.TabIndex = 5;
+			this.toolTip1.SetToolTip(this.EditBranchTextButton, "Edit Branch Text");
+			this.EditBranchTextButton.UseVisualStyleBackColor = true;
+			this.EditBranchTextButton.Click += new System.EventHandler(this.EditBranchTextToolStripMenuItem_Click);
+			// 
+			// UpdateBranchButton
+			// 
+			this.UpdateBranchButton.Enabled = false;
+			this.UpdateBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot;
+			this.UpdateBranchButton.Location = new System.Drawing.Point(102, 19);
+			this.UpdateBranchButton.Name = "UpdateBranchButton";
+			this.UpdateBranchButton.Size = new System.Drawing.Size(25, 23);
+			this.UpdateBranchButton.TabIndex = 4;
+			this.toolTip1.SetToolTip(this.UpdateBranchButton, "Update Branch");
+			this.UpdateBranchButton.UseVisualStyleBackColor = true;
+			this.UpdateBranchButton.Click += new System.EventHandler(this.UpdateBranchToolStripMenuItem_Click);
+			// 
+			// AddWithTextBranchButton
+			// 
+			this.AddWithTextBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AddEdit;
+			this.AddWithTextBranchButton.Location = new System.Drawing.Point(40, 19);
+			this.AddWithTextBranchButton.Name = "AddWithTextBranchButton";
+			this.AddWithTextBranchButton.Size = new System.Drawing.Size(25, 23);
+			this.AddWithTextBranchButton.TabIndex = 3;
+			this.toolTip1.SetToolTip(this.AddWithTextBranchButton, "Add Branch with Text");
+			this.AddWithTextBranchButton.UseVisualStyleBackColor = true;
+			this.AddWithTextBranchButton.Click += new System.EventHandler(this.AddBranchWithTexToolStripMenuItem_Click);
+			// 
+			// AddBranchButton
+			// 
+			this.AddBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add;
+			this.AddBranchButton.Location = new System.Drawing.Point(9, 19);
+			this.AddBranchButton.Name = "AddBranchButton";
+			this.AddBranchButton.Size = new System.Drawing.Size(25, 23);
+			this.AddBranchButton.TabIndex = 2;
+			this.toolTip1.SetToolTip(this.AddBranchButton, "Add Branch");
+			this.AddBranchButton.UseVisualStyleBackColor = true;
+			this.AddBranchButton.Click += new System.EventHandler(this.AddBranchToolStripMenuItem_Click);
+			// 
+			// LoadBranchButton
+			// 
+			this.LoadBranchButton.Enabled = false;
+			this.LoadBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Debugger;
+			this.LoadBranchButton.Location = new System.Drawing.Point(71, 19);
+			this.LoadBranchButton.Name = "LoadBranchButton";
+			this.LoadBranchButton.Size = new System.Drawing.Size(25, 23);
+			this.LoadBranchButton.TabIndex = 1;
+			this.toolTip1.SetToolTip(this.LoadBranchButton, "Load Branch");
+			this.LoadBranchButton.UseVisualStyleBackColor = true;
+			this.LoadBranchButton.Click += new System.EventHandler(this.LoadBranchToolStripMenuItem_Click);
+			// 
 			// BranchView
 			// 
 			this.BranchView.AllowColumnReorder = false;
@@ -75,13 +158,13 @@
 			this.BranchView.HorizontalOrientation = false;
 			this.BranchView.HoverInterval = 500;
 			this.BranchView.LagFramesToHide = 0;
-			this.BranchView.Location = new System.Drawing.Point(6, 19);
+			this.BranchView.Location = new System.Drawing.Point(6, 49);
 			this.BranchView.MaxCharactersInHorizontal = 1;
 			this.BranchView.MultiSelect = false;
 			this.BranchView.Name = "BranchView";
 			this.BranchView.RowCount = 0;
 			this.BranchView.ScrollSpeed = 13;
-			this.BranchView.Size = new System.Drawing.Size(186, 224);
+			this.BranchView.Size = new System.Drawing.Size(186, 223);
 			this.BranchView.TabIndex = 0;
 			this.BranchView.CellHovered += new BizHawk.Client.EmuHawk.InputRoll.HoverEventHandler(this.BranchView_CellHovered);
 			this.BranchView.CellDropped += new BizHawk.Client.EmuHawk.InputRoll.CellDroppedEvent(this.BranchView_CellDropped);
@@ -94,45 +177,61 @@
 			// BranchesContextMenu
 			// 
 			this.BranchesContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.LoadBranchContextMenuItem,
-            this.toolStripSeparator1,
             this.AddBranchContextMenu,
-            this.AddBranchWithTextToolStripMenuItem,
+            this.AddBranchWithTextContextMenuItem,
+            this.LoadBranchContextMenuItem,
             this.UpdateBranchContextMenuItem,
-            this.EditBranchTextToolStripMenuItem,
+            this.EditBranchTextContextMenuItem,
+            this.toolStripSeparator2,
             this.RemoveBranchContextMenuItem});
 			this.BranchesContextMenu.Name = "BranchesContextMenu";
-			this.BranchesContextMenu.Size = new System.Drawing.Size(153, 164);
+			this.BranchesContextMenu.Size = new System.Drawing.Size(153, 142);
 			this.BranchesContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.BranchesContextMenu_Opening);
 			// 
-			// LoadBranchContextMenuItem
-			// 
-			this.LoadBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Debugger;
-			this.LoadBranchContextMenuItem.Name = "LoadBranchContextMenuItem";
-			this.LoadBranchContextMenuItem.Size = new System.Drawing.Size(152, 22);
-			this.LoadBranchContextMenuItem.Text = "Load";
-			this.LoadBranchContextMenuItem.Click += new System.EventHandler(this.LoadBranchContextMenuItem_Click);
-			// 
-			// toolStripSeparator1
-			// 
-			this.toolStripSeparator1.Name = "toolStripSeparator1";
-			this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
-			// 
-			// UpdateBranchContextMenuItem
-			// 
-			this.UpdateBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot;
-			this.UpdateBranchContextMenuItem.Name = "UpdateBranchContextMenuItem";
-			this.UpdateBranchContextMenuItem.Size = new System.Drawing.Size(152, 22);
-			this.UpdateBranchContextMenuItem.Text = "&Update";
-			this.UpdateBranchContextMenuItem.Click += new System.EventHandler(this.UpdateBranchContextMenuItem_Click);
-			// 
 			// AddBranchContextMenu
 			// 
 			this.AddBranchContextMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add;
 			this.AddBranchContextMenu.Name = "AddBranchContextMenu";
 			this.AddBranchContextMenu.Size = new System.Drawing.Size(152, 22);
 			this.AddBranchContextMenu.Text = "Add";
-			this.AddBranchContextMenu.Click += new System.EventHandler(this.AddContextMenu_Click);
+			this.AddBranchContextMenu.Click += new System.EventHandler(this.AddBranchToolStripMenuItem_Click);
+			// 
+			// AddBranchWithTextContextMenuItem
+			// 
+			this.AddBranchWithTextContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AddEdit;
+			this.AddBranchWithTextContextMenuItem.Name = "AddBranchWithTextContextMenuItem";
+			this.AddBranchWithTextContextMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.AddBranchWithTextContextMenuItem.Text = "Add with Text";
+			this.AddBranchWithTextContextMenuItem.Click += new System.EventHandler(this.AddBranchWithTexToolStripMenuItem_Click);
+			// 
+			// LoadBranchContextMenuItem
+			// 
+			this.LoadBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Debugger;
+			this.LoadBranchContextMenuItem.Name = "LoadBranchContextMenuItem";
+			this.LoadBranchContextMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.LoadBranchContextMenuItem.Text = "Load";
+			this.LoadBranchContextMenuItem.Click += new System.EventHandler(this.LoadBranchToolStripMenuItem_Click);
+			// 
+			// UpdateBranchContextMenuItem
+			// 
+			this.UpdateBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot;
+			this.UpdateBranchContextMenuItem.Name = "UpdateBranchContextMenuItem";
+			this.UpdateBranchContextMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.UpdateBranchContextMenuItem.Text = "&Update";
+			this.UpdateBranchContextMenuItem.Click += new System.EventHandler(this.UpdateBranchToolStripMenuItem_Click);
+			// 
+			// EditBranchTextContextMenuItem
+			// 
+			this.EditBranchTextContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil;
+			this.EditBranchTextContextMenuItem.Name = "EditBranchTextContextMenuItem";
+			this.EditBranchTextContextMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.EditBranchTextContextMenuItem.Text = "Edit Text";
+			this.EditBranchTextContextMenuItem.Click += new System.EventHandler(this.EditBranchTextToolStripMenuItem_Click);
+			// 
+			// toolStripSeparator2
+			// 
+			this.toolStripSeparator2.Name = "toolStripSeparator2";
+			this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6);
 			// 
 			// RemoveBranchContextMenuItem
 			// 
@@ -140,30 +239,14 @@
 			this.RemoveBranchContextMenuItem.Name = "RemoveBranchContextMenuItem";
 			this.RemoveBranchContextMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.RemoveBranchContextMenuItem.Text = "Remove";
-			this.RemoveBranchContextMenuItem.Click += new System.EventHandler(this.RemoveBranchContextMenuItem_Click);
-			// 
-			// EditBranchTextToolStripMenuItem
-			// 
-			this.EditBranchTextToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil;
-			this.EditBranchTextToolStripMenuItem.Name = "EditBranchTextToolStripMenuItem";
-			this.EditBranchTextToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-			this.EditBranchTextToolStripMenuItem.Text = "Edit Text";
-			this.EditBranchTextToolStripMenuItem.Click += new System.EventHandler(this.EditBranchTextToolStripMenuItem_Click);
-			// 
-			// AddBranchWithTextToolStripMenuItem
-			// 
-			this.AddBranchWithTextToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add;
-			this.AddBranchWithTextToolStripMenuItem.Name = "AddBranchWithTextToolStripMenuItem";
-			this.AddBranchWithTextToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-			this.AddBranchWithTextToolStripMenuItem.Text = "Add with Text";
-			this.AddBranchWithTextToolStripMenuItem.Click += new System.EventHandler(this.AddBranchWithTextToolStripMenuItem_Click);
+			this.RemoveBranchContextMenuItem.Click += new System.EventHandler(this.RemoveBranchToolStripMenuItem_Click);
 			// 
 			// BookmarksBranchesBox
 			// 
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
 			this.Controls.Add(this.BookmarksBranchesGroupBox);
 			this.Name = "BookmarksBranchesBox";
-			this.Size = new System.Drawing.Size(204, 253);
+			this.Size = new System.Drawing.Size(204, 281);
 			this.BookmarksBranchesGroupBox.ResumeLayout(false);
 			this.BranchesContextMenu.ResumeLayout(false);
 			this.ResumeLayout(false);
@@ -178,9 +261,16 @@
 		private System.Windows.Forms.ToolStripMenuItem AddBranchContextMenu;
 		private System.Windows.Forms.ToolStripMenuItem RemoveBranchContextMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem LoadBranchContextMenuItem;
-		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
 		private System.Windows.Forms.ToolStripMenuItem UpdateBranchContextMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem EditBranchTextToolStripMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem AddBranchWithTextToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem EditBranchTextContextMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem AddBranchWithTextContextMenuItem;
+		private System.Windows.Forms.Button RemoveBranchButton;
+		private System.Windows.Forms.Button EditBranchTextButton;
+		private System.Windows.Forms.Button UpdateBranchButton;
+		private System.Windows.Forms.Button AddWithTextBranchButton;
+		private System.Windows.Forms.Button AddBranchButton;
+		private System.Windows.Forms.Button LoadBranchButton;
+		private System.Windows.Forms.ToolTip toolTip1;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
index 956f4a217e..ccfa8c9666 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
@@ -188,27 +188,28 @@ namespace BizHawk.Client.EmuHawk
 		{
 			UpdateBranchContextMenuItem.Enabled =
 			RemoveBranchContextMenuItem.Enabled =
-				LoadBranchContextMenuItem.Enabled =
+			LoadBranchContextMenuItem.Enabled =
+			EditBranchTextContextMenuItem.Enabled =
 				SelectedBranch != null;
 		}
 
-		private void AddContextMenu_Click(object sender, EventArgs e)
+		private void AddBranchToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			Branch();
 		}
 
-		private void AddBranchWithTextToolStripMenuItem_Click(object sender, EventArgs e)
+		private void AddBranchWithTexToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			Branch();
 			Tastudio.CallEditBranchTextPopUp(Movie.CurrentBranch);
 		}
 
-		private void LoadBranchContextMenuItem_Click(object sender, EventArgs e)
+		private void LoadBranchToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			LoadSelectedBranch();
 		}
 
-		private void UpdateBranchContextMenuItem_Click(object sender, EventArgs e)
+		private void UpdateBranchToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			if (SelectedBranch != null)
 			{
@@ -226,7 +227,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void RemoveBranchContextMenuItem_Click(object sender, EventArgs e)
+		private void RemoveBranchToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			if (SelectedBranch != null)
 			{
@@ -290,7 +291,12 @@ namespace BizHawk.Client.EmuHawk
 
 		private void BranchView_MouseDown(object sender, MouseEventArgs e)
 		{
-			if (e.Button == MouseButtons.Left || e.Button == MouseButtons.Right)
+			UpdateBranchButton.Enabled =
+			RemoveBranchButton.Enabled =
+			LoadBranchButton.Enabled =
+			EditBranchTextButton.Enabled =
+				SelectedBranch != null;
+			if (e.Button == MouseButtons.Left)
 			{
 				if (BranchView.CurrentCell != null && BranchView.CurrentCell.IsDataCell
 					&& BranchView.CurrentCell.Column.Name == BranchNumberColumnName)
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.resx b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.resx
index 82ceea8475..4c3d7ab49c 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.resx
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>179, 17</value>
+  </metadata>
   <metadata name="BranchesContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
diff --git a/BizHawk.sln b/BizHawk.sln
index 745e69b00b..20621e4314 100644
--- a/BizHawk.sln
+++ b/BizHawk.sln
@@ -219,20 +219,20 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{24A0AA3C-B25F-4197-B23D-476D6462DBA0} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{DD448B37-BA3F-4544-9754-5406E8094723} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{C4366030-6D03-424B-AE53-F4F43BB217C3} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
-		{F51946EA-827F-4D82-B841-1F2F6D060312} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
+		{24A0AA3C-B25F-4197-B23D-476D6462DBA0} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
+		{2D2890A8-C338-4439-AD8B-CB9EE85A94F9} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
+		{B95649F5-A0AE-41EB-B62B-578A2AFF5E18} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{E1A23168-B571-411C-B360-2229E7225E0E} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
+		{F51946EA-827F-4D82-B841-1F2F6D060312} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
 		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
 		{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465} = {0540A9A6-977E-466D-8BD3-1D8590BD5282}
 		{5160CFB1-5389-47C1-B7F6-8A0DC97641EE} = {0540A9A6-977E-466D-8BD3-1D8590BD5282}
-		{2D2890A8-C338-4439-AD8B-CB9EE85A94F9} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{337CA23E-65E7-44E1-9411-97EE08BB8116} = {0540A9A6-977E-466D-8BD3-1D8590BD5282}
 		{E6B436B1-A3CD-4C9A-8F76-5D7154726884} = {0540A9A6-977E-466D-8BD3-1D8590BD5282}
-		{B95649F5-A0AE-41EB-B62B-578A2AFF5E18} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = BizHawk.Client.EmuHawk\BizHawk.Client.EmuHawk.csproj
 	EndGlobalSection
-EndGlobal
+EndGlobal