diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index a4cf15eb8e..a66fb72f8b 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -58,6 +58,12 @@
   <ItemGroup>
     <Compile Include="Config.cs" />
     <Compile Include="ConfigService.cs" />
+    <Compile Include="config\InputConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="config\InputConfig.designer.cs">
+      <DependentUpon>InputConfig.cs</DependentUpon>
+    </Compile>
     <Compile Include="Gameboy\Debugger.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -163,6 +169,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="config\InputConfig.resx">
+      <DependentUpon>InputConfig.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="images\BuilderDialog_delete.bmp" />
     <EmbeddedResource Include="images\BuilderDialog_movedown.bmp" />
     <EmbeddedResource Include="images\BuilderDialog_moveup.bmp" />
diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs
index 80cce6a23b..c60a1d0d79 100644
--- a/BizHawk.MultiClient/MainForm.Designer.cs
+++ b/BizHawk.MultiClient/MainForm.Designer.cs
@@ -89,6 +89,10 @@
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.powerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+            this.sega8bitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.enableFMChipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.overclockWhenKnownSafeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.windowSizeMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.x1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -114,10 +118,6 @@
             this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
-            this.sega8bitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.enableFMChipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.overclockWhenKnownSafeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -151,7 +151,7 @@
             this.toolStripSeparator4,
             this.exitToolStripMenuItem});
             this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
             this.fileToolStripMenuItem.Text = "&File";
             this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened);
             // 
@@ -159,7 +159,7 @@
             // 
             this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem";
             this.openROMToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
-            this.openROMToolStripMenuItem.Size = new System.Drawing.Size(176, 22);
+            this.openROMToolStripMenuItem.Size = new System.Drawing.Size(177, 22);
             this.openROMToolStripMenuItem.Text = "Open ROM";
             this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click);
             // 
@@ -171,46 +171,46 @@
             this.clearToolStripMenuItem,
             this.autoloadMostRecentToolStripMenuItem});
             this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem";
-            this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(176, 22);
+            this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(177, 22);
             this.recentROMToolStripMenuItem.Text = "Recent ROM";
             this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened);
             // 
             // noneToolStripMenuItem
             // 
             this.noneToolStripMenuItem.Name = "noneToolStripMenuItem";
-            this.noneToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
+            this.noneToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
             this.noneToolStripMenuItem.Text = "None";
             // 
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(189, 6);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(188, 6);
             // 
             // clearToolStripMenuItem
             // 
             this.clearToolStripMenuItem.Name = "clearToolStripMenuItem";
-            this.clearToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
+            this.clearToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
             this.clearToolStripMenuItem.Text = "&Clear";
             this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click);
             // 
             // autoloadMostRecentToolStripMenuItem
             // 
             this.autoloadMostRecentToolStripMenuItem.Name = "autoloadMostRecentToolStripMenuItem";
-            this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
+            this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
             this.autoloadMostRecentToolStripMenuItem.Text = "&Autoload Most Recent";
             this.autoloadMostRecentToolStripMenuItem.Click += new System.EventHandler(this.autoloadMostRecentToolStripMenuItem_Click);
             // 
             // closeROMToolStripMenuItem
             // 
             this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem";
-            this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(176, 22);
+            this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(177, 22);
             this.closeROMToolStripMenuItem.Text = "&Close ROM";
             this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click);
             // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(173, 6);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(174, 6);
             // 
             // saveStateToolStripMenuItem
             // 
@@ -228,14 +228,14 @@
             this.toolStripSeparator6,
             this.saveNamedStateToolStripMenuItem});
             this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem";
-            this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(176, 22);
+            this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(177, 22);
             this.saveStateToolStripMenuItem.Text = "Save State";
             // 
             // savestate1toolStripMenuItem
             // 
             this.savestate1toolStripMenuItem.Name = "savestate1toolStripMenuItem";
             this.savestate1toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F1)));
-            this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+            this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.savestate1toolStripMenuItem.Text = "1";
             this.savestate1toolStripMenuItem.Click += new System.EventHandler(this.savestate1toolStripMenuItem_Click);
             // 
@@ -243,7 +243,7 @@
             // 
             this.savestate2toolStripMenuItem.Name = "savestate2toolStripMenuItem";
             this.savestate2toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F2)));
-            this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+            this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.savestate2toolStripMenuItem.Text = "2";
             this.savestate2toolStripMenuItem.Click += new System.EventHandler(this.savestate2toolStripMenuItem_Click);
             // 
@@ -251,7 +251,7 @@
             // 
             this.savestate3toolStripMenuItem.Name = "savestate3toolStripMenuItem";
             this.savestate3toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F3)));
-            this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+            this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.savestate3toolStripMenuItem.Text = "3";
             this.savestate3toolStripMenuItem.Click += new System.EventHandler(this.savestate3toolStripMenuItem_Click);
             // 
@@ -259,7 +259,7 @@
             // 
             this.savestate4toolStripMenuItem.Name = "savestate4toolStripMenuItem";
             this.savestate4toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F4)));
-            this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+            this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.savestate4toolStripMenuItem.Text = "4";
             this.savestate4toolStripMenuItem.Click += new System.EventHandler(this.savestate4toolStripMenuItem_Click);
             // 
@@ -267,7 +267,7 @@
             // 
             this.savestate5toolStripMenuItem.Name = "savestate5toolStripMenuItem";
             this.savestate5toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F5)));
-            this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+            this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.savestate5toolStripMenuItem.Text = "5";
             this.savestate5toolStripMenuItem.Click += new System.EventHandler(this.savestate5toolStripMenuItem_Click);
             // 
@@ -275,7 +275,7 @@
             // 
             this.savestate6toolStripMenuItem.Name = "savestate6toolStripMenuItem";
             this.savestate6toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F6)));
-            this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+            this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.savestate6toolStripMenuItem.Text = "6";
             this.savestate6toolStripMenuItem.Click += new System.EventHandler(this.savestate6toolStripMenuItem_Click);
             // 
@@ -283,7 +283,7 @@
             // 
             this.savestate7toolStripMenuItem.Name = "savestate7toolStripMenuItem";
             this.savestate7toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F7)));
-            this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+            this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.savestate7toolStripMenuItem.Text = "7";
             this.savestate7toolStripMenuItem.Click += new System.EventHandler(this.savestate7toolStripMenuItem_Click);
             // 
@@ -291,7 +291,7 @@
             // 
             this.savestate8toolStripMenuItem.Name = "savestate8toolStripMenuItem";
             this.savestate8toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F8)));
-            this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+            this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.savestate8toolStripMenuItem.Text = "8";
             this.savestate8toolStripMenuItem.Click += new System.EventHandler(this.savestate8toolStripMenuItem_Click);
             // 
@@ -299,7 +299,7 @@
             // 
             this.savestate9toolStripMenuItem.Name = "savestate9toolStripMenuItem";
             this.savestate9toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F9)));
-            this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+            this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.savestate9toolStripMenuItem.Text = "9";
             this.savestate9toolStripMenuItem.Click += new System.EventHandler(this.savestate9toolStripMenuItem_Click);
             // 
@@ -307,20 +307,20 @@
             // 
             this.savestate0toolStripMenuItem.Name = "savestate0toolStripMenuItem";
             this.savestate0toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F10)));
-            this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+            this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.savestate0toolStripMenuItem.Text = "0";
             this.savestate0toolStripMenuItem.Click += new System.EventHandler(this.savestate0toolStripMenuItem_Click);
             // 
             // toolStripSeparator6
             // 
             this.toolStripSeparator6.Name = "toolStripSeparator6";
-            this.toolStripSeparator6.Size = new System.Drawing.Size(206, 6);
+            this.toolStripSeparator6.Size = new System.Drawing.Size(209, 6);
             // 
             // saveNamedStateToolStripMenuItem
             // 
             this.saveNamedStateToolStripMenuItem.Name = "saveNamedStateToolStripMenuItem";
             this.saveNamedStateToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
-            this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+            this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.saveNamedStateToolStripMenuItem.Text = "Save Named State";
             // 
             // loadStateToolStripMenuItem
@@ -339,14 +339,14 @@
             this.toolStripSeparator7,
             this.loadNamedStateToolStripMenuItem});
             this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem";
-            this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(176, 22);
+            this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(177, 22);
             this.loadStateToolStripMenuItem.Text = "Load State";
             // 
             // loadstate1toolStripMenuItem
             // 
             this.loadstate1toolStripMenuItem.Name = "loadstate1toolStripMenuItem";
             this.loadstate1toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1;
-            this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(211, 22);
+            this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.loadstate1toolStripMenuItem.Text = "1";
             this.loadstate1toolStripMenuItem.Click += new System.EventHandler(this.loadstate1toolStripMenuItem_Click);
             // 
@@ -354,7 +354,7 @@
             // 
             this.loadstate2toolStripMenuItem.Name = "loadstate2toolStripMenuItem";
             this.loadstate2toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F2;
-            this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(211, 22);
+            this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.loadstate2toolStripMenuItem.Text = "2";
             this.loadstate2toolStripMenuItem.Click += new System.EventHandler(this.loadstate2toolStripMenuItem_Click);
             // 
@@ -362,7 +362,7 @@
             // 
             this.loadstate3toolStripMenuItem.Name = "loadstate3toolStripMenuItem";
             this.loadstate3toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3;
-            this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(211, 22);
+            this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.loadstate3toolStripMenuItem.Text = "3";
             this.loadstate3toolStripMenuItem.Click += new System.EventHandler(this.loadstate3toolStripMenuItem_Click);
             // 
@@ -370,7 +370,7 @@
             // 
             this.loadstate4toolStripMenuItem.Name = "loadstate4toolStripMenuItem";
             this.loadstate4toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F4;
-            this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(211, 22);
+            this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.loadstate4toolStripMenuItem.Text = "4";
             this.loadstate4toolStripMenuItem.Click += new System.EventHandler(this.loadstate4toolStripMenuItem_Click);
             // 
@@ -378,7 +378,7 @@
             // 
             this.loadstate5toolStripMenuItem.Name = "loadstate5toolStripMenuItem";
             this.loadstate5toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5;
-            this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(211, 22);
+            this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.loadstate5toolStripMenuItem.Text = "5";
             this.loadstate5toolStripMenuItem.Click += new System.EventHandler(this.loadstate5toolStripMenuItem_Click);
             // 
@@ -386,7 +386,7 @@
             // 
             this.loadstate6toolStripMenuItem.Name = "loadstate6toolStripMenuItem";
             this.loadstate6toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F6;
-            this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(211, 22);
+            this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.loadstate6toolStripMenuItem.Text = "6";
             this.loadstate6toolStripMenuItem.Click += new System.EventHandler(this.loadstate6toolStripMenuItem_Click);
             // 
@@ -394,7 +394,7 @@
             // 
             this.loadstate7toolStripMenuItem.Name = "loadstate7toolStripMenuItem";
             this.loadstate7toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F7;
-            this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(211, 22);
+            this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.loadstate7toolStripMenuItem.Text = "7";
             this.loadstate7toolStripMenuItem.Click += new System.EventHandler(this.loadstate7toolStripMenuItem_Click);
             // 
@@ -402,7 +402,7 @@
             // 
             this.loadstate8toolStripMenuItem.Name = "loadstate8toolStripMenuItem";
             this.loadstate8toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F8;
-            this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(211, 22);
+            this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.loadstate8toolStripMenuItem.Text = "8";
             this.loadstate8toolStripMenuItem.Click += new System.EventHandler(this.loadstate8toolStripMenuItem_Click);
             // 
@@ -410,7 +410,7 @@
             // 
             this.loadstate9toolStripMenuItem.Name = "loadstate9toolStripMenuItem";
             this.loadstate9toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F9;
-            this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(211, 22);
+            this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.loadstate9toolStripMenuItem.Text = "9";
             this.loadstate9toolStripMenuItem.Click += new System.EventHandler(this.loadstate9toolStripMenuItem_Click);
             // 
@@ -418,20 +418,20 @@
             // 
             this.loadstate0toolStripMenuItem.Name = "loadstate0toolStripMenuItem";
             this.loadstate0toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F10;
-            this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(211, 22);
+            this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.loadstate0toolStripMenuItem.Text = "0";
             this.loadstate0toolStripMenuItem.Click += new System.EventHandler(this.loadstate0toolStripMenuItem_Click);
             // 
             // toolStripSeparator7
             // 
             this.toolStripSeparator7.Name = "toolStripSeparator7";
-            this.toolStripSeparator7.Size = new System.Drawing.Size(208, 6);
+            this.toolStripSeparator7.Size = new System.Drawing.Size(207, 6);
             // 
             // loadNamedStateToolStripMenuItem
             // 
             this.loadNamedStateToolStripMenuItem.Name = "loadNamedStateToolStripMenuItem";
             this.loadNamedStateToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L)));
-            this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(211, 22);
+            this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.loadNamedStateToolStripMenuItem.Text = "Load Named State";
             // 
             // saveSlotToolStripMenuItem
@@ -453,135 +453,135 @@
             this.saveToCurrentSlotToolStripMenuItem,
             this.loadCurrentSlotToolStripMenuItem});
             this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem";
-            this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(176, 22);
+            this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(177, 22);
             this.saveSlotToolStripMenuItem.Text = "SaveSlot";
             // 
             // selectSlot10ToolStripMenuItem
             // 
             this.selectSlot10ToolStripMenuItem.Name = "selectSlot10ToolStripMenuItem";
-            this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
             this.selectSlot10ToolStripMenuItem.Text = "Select Slot 0";
             this.selectSlot10ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot10ToolStripMenuItem_Click);
             // 
             // selectSlot1ToolStripMenuItem
             // 
             this.selectSlot1ToolStripMenuItem.Name = "selectSlot1ToolStripMenuItem";
-            this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
             this.selectSlot1ToolStripMenuItem.Text = "Select Slot 1";
             this.selectSlot1ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot1ToolStripMenuItem_Click);
             // 
             // selectSlot2ToolStripMenuItem
             // 
             this.selectSlot2ToolStripMenuItem.Name = "selectSlot2ToolStripMenuItem";
-            this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
             this.selectSlot2ToolStripMenuItem.Text = "Select Slot 2";
             this.selectSlot2ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot2ToolStripMenuItem_Click);
             // 
             // selectSlot3ToolStripMenuItem
             // 
             this.selectSlot3ToolStripMenuItem.Name = "selectSlot3ToolStripMenuItem";
-            this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
             this.selectSlot3ToolStripMenuItem.Text = "Select Slot 3";
             this.selectSlot3ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot3ToolStripMenuItem_Click);
             // 
             // selectSlot4ToolStripMenuItem
             // 
             this.selectSlot4ToolStripMenuItem.Name = "selectSlot4ToolStripMenuItem";
-            this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
             this.selectSlot4ToolStripMenuItem.Text = "Select Slot 4";
             this.selectSlot4ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot4ToolStripMenuItem_Click);
             // 
             // selectSlot5ToolStripMenuItem
             // 
             this.selectSlot5ToolStripMenuItem.Name = "selectSlot5ToolStripMenuItem";
-            this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
             this.selectSlot5ToolStripMenuItem.Text = "Select Slot 5";
             this.selectSlot5ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot5ToolStripMenuItem_Click);
             // 
             // selectSlot6ToolStripMenuItem
             // 
             this.selectSlot6ToolStripMenuItem.Name = "selectSlot6ToolStripMenuItem";
-            this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
             this.selectSlot6ToolStripMenuItem.Text = "Select Slot 6";
             this.selectSlot6ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot6ToolStripMenuItem_Click);
             // 
             // selectSlot7ToolStripMenuItem
             // 
             this.selectSlot7ToolStripMenuItem.Name = "selectSlot7ToolStripMenuItem";
-            this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
             this.selectSlot7ToolStripMenuItem.Text = "Select Slot 7";
             this.selectSlot7ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot7ToolStripMenuItem_Click);
             // 
             // selectSlot8ToolStripMenuItem
             // 
             this.selectSlot8ToolStripMenuItem.Name = "selectSlot8ToolStripMenuItem";
-            this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
             this.selectSlot8ToolStripMenuItem.Text = "Select Slot 8";
             this.selectSlot8ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot8ToolStripMenuItem_Click);
             // 
             // selectSlot9ToolStripMenuItem
             // 
             this.selectSlot9ToolStripMenuItem.Name = "selectSlot9ToolStripMenuItem";
-            this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
             this.selectSlot9ToolStripMenuItem.Text = "Select Slot 9";
             this.selectSlot9ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot9ToolStripMenuItem_Click);
             // 
             // previousSlotToolStripMenuItem
             // 
             this.previousSlotToolStripMenuItem.Name = "previousSlotToolStripMenuItem";
-            this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
             this.previousSlotToolStripMenuItem.Text = "Previous Slot";
             this.previousSlotToolStripMenuItem.Click += new System.EventHandler(this.previousSlotToolStripMenuItem_Click);
             // 
             // nextSlotToolStripMenuItem
             // 
             this.nextSlotToolStripMenuItem.Name = "nextSlotToolStripMenuItem";
-            this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
             this.nextSlotToolStripMenuItem.Text = "Next Slot";
             this.nextSlotToolStripMenuItem.Click += new System.EventHandler(this.nextSlotToolStripMenuItem_Click);
             // 
             // toolStripSeparator5
             // 
             this.toolStripSeparator5.Name = "toolStripSeparator5";
-            this.toolStripSeparator5.Size = new System.Drawing.Size(175, 6);
+            this.toolStripSeparator5.Size = new System.Drawing.Size(180, 6);
             // 
             // saveToCurrentSlotToolStripMenuItem
             // 
             this.saveToCurrentSlotToolStripMenuItem.Name = "saveToCurrentSlotToolStripMenuItem";
-            this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
             this.saveToCurrentSlotToolStripMenuItem.Text = "Save to Current Slot";
             this.saveToCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.saveToCurrentSlotToolStripMenuItem_Click);
             // 
             // loadCurrentSlotToolStripMenuItem
             // 
             this.loadCurrentSlotToolStripMenuItem.Name = "loadCurrentSlotToolStripMenuItem";
-            this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
+            this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
             this.loadCurrentSlotToolStripMenuItem.Text = "Load Current Slot";
             this.loadCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.loadCurrentSlotToolStripMenuItem_Click);
             // 
             // toolStripMenuItem2
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(173, 6);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(174, 6);
             // 
             // screenshotF12ToolStripMenuItem
             // 
             this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem";
             this.screenshotF12ToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F12;
-            this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(176, 22);
+            this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(177, 22);
             this.screenshotF12ToolStripMenuItem.Text = "Screenshot";
             this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click);
             // 
             // toolStripSeparator4
             // 
             this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(173, 6);
+            this.toolStripSeparator4.Size = new System.Drawing.Size(174, 6);
             // 
             // exitToolStripMenuItem
             // 
             this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
             this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
-            this.exitToolStripMenuItem.Size = new System.Drawing.Size(176, 22);
+            this.exitToolStripMenuItem.Size = new System.Drawing.Size(177, 22);
             this.exitToolStripMenuItem.Text = "Exit";
             this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
             // 
@@ -595,36 +595,64 @@
             this.toolStripSeparator8,
             this.sega8bitToolStripMenuItem});
             this.emulationToolStripMenuItem.Name = "emulationToolStripMenuItem";
-            this.emulationToolStripMenuItem.Size = new System.Drawing.Size(73, 20);
+            this.emulationToolStripMenuItem.Size = new System.Drawing.Size(65, 20);
             this.emulationToolStripMenuItem.Text = "&Emulation";
             this.emulationToolStripMenuItem.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened);
             // 
             // pauseToolStripMenuItem
             // 
             this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem";
-            this.pauseToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.pauseToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
             this.pauseToolStripMenuItem.Text = "&Pause";
             this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click);
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(136, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6);
             // 
             // powerToolStripMenuItem
             // 
             this.powerToolStripMenuItem.Name = "powerToolStripMenuItem";
-            this.powerToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.powerToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
             this.powerToolStripMenuItem.Text = "Power Cycle";
             this.powerToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click);
             // 
             // resetToolStripMenuItem
             // 
             this.resetToolStripMenuItem.Name = "resetToolStripMenuItem";
-            this.resetToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.resetToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
             this.resetToolStripMenuItem.Text = "&Reset";
             this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click);
             // 
+            // toolStripSeparator8
+            // 
+            this.toolStripSeparator8.Name = "toolStripSeparator8";
+            this.toolStripSeparator8.Size = new System.Drawing.Size(141, 6);
+            // 
+            // sega8bitToolStripMenuItem
+            // 
+            this.sega8bitToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.enableFMChipToolStripMenuItem,
+            this.overclockWhenKnownSafeToolStripMenuItem});
+            this.sega8bitToolStripMenuItem.Name = "sega8bitToolStripMenuItem";
+            this.sega8bitToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+            this.sega8bitToolStripMenuItem.Text = "Sega 8-bit";
+            // 
+            // enableFMChipToolStripMenuItem
+            // 
+            this.enableFMChipToolStripMenuItem.Name = "enableFMChipToolStripMenuItem";
+            this.enableFMChipToolStripMenuItem.Size = new System.Drawing.Size(221, 22);
+            this.enableFMChipToolStripMenuItem.Text = "Enable FM Chip";
+            this.enableFMChipToolStripMenuItem.Click += new System.EventHandler(this.enableFMChipToolStripMenuItem_Click);
+            // 
+            // overclockWhenKnownSafeToolStripMenuItem
+            // 
+            this.overclockWhenKnownSafeToolStripMenuItem.Name = "overclockWhenKnownSafeToolStripMenuItem";
+            this.overclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(221, 22);
+            this.overclockWhenKnownSafeToolStripMenuItem.Text = "Overclock when Known Safe";
+            this.overclockWhenKnownSafeToolStripMenuItem.Click += new System.EventHandler(this.overclockWhenKnownSafeToolStripMenuItem_Click);
+            // 
             // viewToolStripMenuItem
             // 
             this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -635,7 +663,7 @@
             this.displayInputToolStripMenuItem,
             this.displayLagCounterToolStripMenuItem});
             this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
-            this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+            this.viewToolStripMenuItem.Size = new System.Drawing.Size(41, 20);
             this.viewToolStripMenuItem.Text = "&View";
             // 
             // windowSizeMenuItem
@@ -654,42 +682,42 @@
             // x1MenuItem
             // 
             this.x1MenuItem.Name = "x1MenuItem";
-            this.x1MenuItem.Size = new System.Drawing.Size(152, 22);
+            this.x1MenuItem.Size = new System.Drawing.Size(105, 22);
             this.x1MenuItem.Text = "&1x";
             this.x1MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click);
             // 
             // x2MenuItem
             // 
             this.x2MenuItem.Name = "x2MenuItem";
-            this.x2MenuItem.Size = new System.Drawing.Size(152, 22);
+            this.x2MenuItem.Size = new System.Drawing.Size(105, 22);
             this.x2MenuItem.Text = "&2x";
             this.x2MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click);
             // 
             // x3MenuItem
             // 
             this.x3MenuItem.Name = "x3MenuItem";
-            this.x3MenuItem.Size = new System.Drawing.Size(152, 22);
+            this.x3MenuItem.Size = new System.Drawing.Size(105, 22);
             this.x3MenuItem.Text = "&3x";
             this.x3MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click);
             // 
             // x4MenuItem
             // 
             this.x4MenuItem.Name = "x4MenuItem";
-            this.x4MenuItem.Size = new System.Drawing.Size(152, 22);
+            this.x4MenuItem.Size = new System.Drawing.Size(105, 22);
             this.x4MenuItem.Text = "&4x";
             this.x4MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click);
             // 
             // x5MenuItem
             // 
             this.x5MenuItem.Name = "x5MenuItem";
-            this.x5MenuItem.Size = new System.Drawing.Size(152, 22);
+            this.x5MenuItem.Size = new System.Drawing.Size(105, 22);
             this.x5MenuItem.Text = "&5x";
             this.x5MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click);
             // 
             // mzMenuItem
             // 
             this.mzMenuItem.Name = "mzMenuItem";
-            this.mzMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.mzMenuItem.Size = new System.Drawing.Size(105, 22);
             this.mzMenuItem.Text = "&Max";
             this.mzMenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click);
             // 
@@ -736,12 +764,11 @@
             this.controllersToolStripMenuItem,
             this.hotkeysToolStripMenuItem});
             this.configToolStripMenuItem.Name = "configToolStripMenuItem";
-            this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
+            this.configToolStripMenuItem.Size = new System.Drawing.Size(50, 20);
             this.configToolStripMenuItem.Text = "&Config";
             // 
             // controllersToolStripMenuItem
             // 
-            this.controllersToolStripMenuItem.Enabled = false;
             this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem";
             this.controllersToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
             this.controllersToolStripMenuItem.Text = "&Controllers";
@@ -764,20 +791,20 @@
             this.hexEditorToolStripMenuItem,
             this.luaConsoleToolStripMenuItem});
             this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
-            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
+            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
             this.toolsToolStripMenuItem.Text = "&Tools";
             // 
             // rAMWatchToolStripMenuItem
             // 
             this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem";
-            this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
             this.rAMWatchToolStripMenuItem.Text = "RAM &Watch";
             this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click);
             // 
             // rAMSearchToolStripMenuItem
             // 
             this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem";
-            this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
             this.rAMSearchToolStripMenuItem.Text = "RAM &Search";
             this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click);
             // 
@@ -785,21 +812,21 @@
             // 
             this.debuggerToolStripMenuItem.Enabled = false;
             this.debuggerToolStripMenuItem.Name = "debuggerToolStripMenuItem";
-            this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
             this.debuggerToolStripMenuItem.Text = "&Debugger";
             // 
             // hexEditorToolStripMenuItem
             // 
             this.hexEditorToolStripMenuItem.Enabled = false;
             this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem";
-            this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
             this.hexEditorToolStripMenuItem.Text = "&Hex Editor";
             // 
             // luaConsoleToolStripMenuItem
             // 
             this.luaConsoleToolStripMenuItem.Enabled = false;
             this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem";
-            this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
+            this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
             this.luaConsoleToolStripMenuItem.Text = "Lua Console";
             // 
             // helpToolStripMenuItem
@@ -808,14 +835,14 @@
             this.helpToolStripMenuItem1,
             this.aboutToolStripMenuItem});
             this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
-            this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+            this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
             this.helpToolStripMenuItem.Text = "&Help";
             // 
             // helpToolStripMenuItem1
             // 
             this.helpToolStripMenuItem1.Enabled = false;
             this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1";
-            this.helpToolStripMenuItem1.Size = new System.Drawing.Size(107, 22);
+            this.helpToolStripMenuItem1.Size = new System.Drawing.Size(114, 22);
             this.helpToolStripMenuItem1.Text = "&Help";
             this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click);
             // 
@@ -823,38 +850,10 @@
             // 
             this.aboutToolStripMenuItem.Enabled = false;
             this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(107, 22);
+            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
             this.aboutToolStripMenuItem.Text = "&About";
             this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
             // 
-            // toolStripSeparator8
-            // 
-            this.toolStripSeparator8.Name = "toolStripSeparator8";
-            this.toolStripSeparator8.Size = new System.Drawing.Size(149, 6);
-            // 
-            // sega8bitToolStripMenuItem
-            // 
-            this.sega8bitToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.enableFMChipToolStripMenuItem,
-            this.overclockWhenKnownSafeToolStripMenuItem});
-            this.sega8bitToolStripMenuItem.Name = "sega8bitToolStripMenuItem";
-            this.sega8bitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.sega8bitToolStripMenuItem.Text = "Sega 8-bit";
-            // 
-            // enableFMChipToolStripMenuItem
-            // 
-            this.enableFMChipToolStripMenuItem.Name = "enableFMChipToolStripMenuItem";
-            this.enableFMChipToolStripMenuItem.Size = new System.Drawing.Size(224, 22);
-            this.enableFMChipToolStripMenuItem.Text = "Enable FM Chip";
-            this.enableFMChipToolStripMenuItem.Click += new System.EventHandler(this.enableFMChipToolStripMenuItem_Click);
-            // 
-            // overclockWhenKnownSafeToolStripMenuItem
-            // 
-            this.overclockWhenKnownSafeToolStripMenuItem.Name = "overclockWhenKnownSafeToolStripMenuItem";
-            this.overclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(224, 22);
-            this.overclockWhenKnownSafeToolStripMenuItem.Text = "Overclock when Known Safe";
-            this.overclockWhenKnownSafeToolStripMenuItem.Click += new System.EventHandler(this.overclockWhenKnownSafeToolStripMenuItem_Click);
-            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 0fd2412686..e46cb1978c 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -536,7 +536,8 @@ namespace BizHawk.MultiClient
 
         private void controllersToolStripMenuItem_Click(object sender, EventArgs e)
         {
-
+            InputConfig i = new InputConfig();
+            i.ShowDialog();
         }
 
         private void hotkeysToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/BizHawk.MultiClient/config/InputConfig.Designer.cs b/BizHawk.MultiClient/config/InputConfig.Designer.cs
new file mode 100644
index 0000000000..239c8235aa
--- /dev/null
+++ b/BizHawk.MultiClient/config/InputConfig.Designer.cs
@@ -0,0 +1,84 @@
+namespace BizHawk.MultiClient
+{
+    partial class InputConfig
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InputConfig));
+            this.OK = new System.Windows.Forms.Button();
+            this.Cancel = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // OK
+            // 
+            this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.OK.Location = new System.Drawing.Point(320, 366);
+            this.OK.Name = "OK";
+            this.OK.Size = new System.Drawing.Size(75, 23);
+            this.OK.TabIndex = 0;
+            this.OK.Text = "&Ok";
+            this.OK.UseVisualStyleBackColor = true;
+            this.OK.Click += new System.EventHandler(this.OK_Click);
+            // 
+            // Cancel
+            // 
+            this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.Cancel.Location = new System.Drawing.Point(401, 366);
+            this.Cancel.Name = "Cancel";
+            this.Cancel.Size = new System.Drawing.Size(75, 23);
+            this.Cancel.TabIndex = 1;
+            this.Cancel.Text = "&Cancel";
+            this.Cancel.UseVisualStyleBackColor = true;
+            this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
+            // 
+            // InputConfig
+            // 
+            this.AcceptButton = this.OK;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.Cancel;
+            this.ClientSize = new System.Drawing.Size(488, 423);
+            this.Controls.Add(this.Cancel);
+            this.Controls.Add(this.OK);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "InputConfig";
+            this.ShowIcon = false;
+            this.Text = "Configure Controllers";
+            this.Load += new System.EventHandler(this.InputConfig_Load);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button OK;
+        private System.Windows.Forms.Button Cancel;
+    }
+}
\ No newline at end of file
diff --git a/BizHawk.MultiClient/config/InputConfig.cs b/BizHawk.MultiClient/config/InputConfig.cs
new file mode 100644
index 0000000000..0c9e31f597
--- /dev/null
+++ b/BizHawk.MultiClient/config/InputConfig.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace BizHawk.MultiClient
+{
+    public partial class InputConfig : Form
+    {
+        public InputConfig()
+        {
+            InitializeComponent();
+        }
+
+        private void InputConfig_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        private void OK_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void Cancel_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+    }
+}
diff --git a/BizHawk.MultiClient/config/InputConfig.resx b/BizHawk.MultiClient/config/InputConfig.resx
new file mode 100644
index 0000000000..39ab106445
--- /dev/null
+++ b/BizHawk.MultiClient/config/InputConfig.resx
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAABMLAAATCwAAAAEAAAAA
+        AAB2LggAcTANAHUxDAB3NxQAezUQAHw5FQB+PBcAfDsYAHw9HAB+Px8AfkAgAIREIQCFRCEAhEYmAIZG
+        JACHRyQAh0gmAIdJKQCGSikAh0ooAIpLKQCMTy0Ai08wAIpRMQCOVTYAjlc5AI9YOQCRUzEAkVQxAJBX
+        NwCWWDYAk1o7AJRaOwCSWzwAlV8/AJdmSgCbZkkAnWtPAJ9rTgCebE4ApmxNAKBwVwCjclcAr3VTAKx2
+        VQCtdlYApHdaALV/XwCgeWEAqHtjAKp9YwCrfmIArH5jALmAXwCwhWwAvIlsAK6HcACwiXIAsolwALKN
+        dgC1jHQAtY94ALaRewC3kXoAuZJ8ALmVfwC6ln8Aw5F1AL2ahgC9nosAt6KTAM2ehADBn4oAyqCJAMui
+        iwDNo4wA0KKHAMSlkQDQqZMA3b+vAN7DsQDfxLIA4Ma6AOPIuADkyLgA59LHAO7SwQDs2M0A8NXEAObZ
+        0gDr4t8A7+biAPXo4QDx6OUA9/DqAPn08QD79vMA/fbwAPv5+AD8+voA/v39AP///wAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZGZkYpKWYwLiIaGQkKZjMzIychFwFmPmNTSzUK
+        ZmYzM1tSTisQZj5jU0s1CmZmZjNdWk83EmY+Y1NLNQpmZmYzXVpPNxJmRGRcVEcKZmZmM11aTzcSZkU2
+        JhsRDQUEOCYcFAgDHWZIOWVVSigGOztZV0ksBzxmSEBeYVgvEAQ7ZWBWLQ9mZmY9QTQkFSAeMToqEwsy
+        ZmZmZkJiUEMMAEJiUUwOZmZmZmZIPyUWEmZNPyUWEmZmZmZmZh9fAgVmBR9fAmZmZmZmZmZIOhhmZmZI
+        OhhmZmZmZmZmZmZmZmZmZmZmZmZmZv//fAD/0X8AAQF/AAMBdQADgYYAA4GLAAOBkwAAAYQAAAGKAAAD
+        iQCAA4sAwAeMAMEHhwDhD5EA44+TAP//rwA=
+</value>
+  </data>
+</root>
\ No newline at end of file