diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 7e7b2faa1f..66b8ab5a9d 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -197,20 +197,30 @@
     <Compile Include="config\FirmwaresConfigInfo.Designer.cs">
       <DependentUpon>FirmwaresConfigInfo.cs</DependentUpon>
     </Compile>
-    <Compile Include="config\GB\BmpView.cs" />
-    <Compile Include="config\GB\CGBColorChooserForm.cs" />
+    <Compile Include="config\GB\BmpView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="config\GB\CGBColorChooserForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="config\GB\CGBColorChooserForm.Designer.cs">
       <DependentUpon>CGBColorChooserForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="config\GB\ColorChooserForm.cs" />
+    <Compile Include="config\GB\ColorChooserForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="config\GB\ColorChooserForm.Designer.cs">
       <DependentUpon>ColorChooserForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="config\GB\DualGBFileSelector.cs" />
+    <Compile Include="config\GB\DualGBFileSelector.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="config\GB\DualGBFileSelector.Designer.cs">
       <DependentUpon>DualGBFileSelector.cs</DependentUpon>
     </Compile>
-    <Compile Include="config\GB\DualGBXMLCreator.cs" />
+    <Compile Include="config\GB\DualGBXMLCreator.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="config\GB\DualGBXMLCreator.Designer.cs">
       <DependentUpon>DualGBXMLCreator.cs</DependentUpon>
     </Compile>
@@ -235,15 +245,21 @@
     <Compile Include="config\MessageConfig.Designer.cs">
       <DependentUpon>MessageConfig.cs</DependentUpon>
     </Compile>
-    <Compile Include="config\N64\N64VideoPluginconfig.cs" />
+    <Compile Include="config\N64\N64VideoPluginconfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="config\N64\N64VideoPluginconfig.Designer.cs">
       <DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
     </Compile>
-    <Compile Include="config\NES\NESGraphicsConfig.cs" />
+    <Compile Include="config\NES\NESGraphicsConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="config\NES\NESGraphicsConfig.Designer.cs">
       <DependentUpon>NESGraphicsConfig.cs</DependentUpon>
     </Compile>
-    <Compile Include="config\NES\NESSoundConfig.cs" />
+    <Compile Include="config\NES\NESSoundConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="config\NES\NESSoundConfig.Designer.cs">
       <DependentUpon>NESSoundConfig.cs</DependentUpon>
     </Compile>
@@ -259,7 +275,9 @@
     <Compile Include="config\PathInfo.Designer.cs">
       <DependentUpon>PathInfo.cs</DependentUpon>
     </Compile>
-    <Compile Include="config\PCE\PCEGraphicsConfig.cs" />
+    <Compile Include="config\PCE\PCEGraphicsConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="config\PCE\PCEGraphicsConfig.Designer.cs">
       <DependentUpon>PCEGraphicsConfig.cs</DependentUpon>
     </Compile>
@@ -269,15 +287,21 @@
     <Compile Include="config\RewindConfig.Designer.cs">
       <DependentUpon>RewindConfig.cs</DependentUpon>
     </Compile>
-    <Compile Include="config\Saturn\SaturnPrefs.cs" />
+    <Compile Include="config\Saturn\SaturnPrefs.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="config\Saturn\SaturnPrefs.Designer.cs">
       <DependentUpon>SaturnPrefs.cs</DependentUpon>
     </Compile>
-    <Compile Include="config\SMS\SMSGraphicsConfig.cs" />
+    <Compile Include="config\SMS\SMSGraphicsConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="config\SMS\SMSGraphicsConfig.Designer.cs">
       <DependentUpon>SMSGraphicsConfig.cs</DependentUpon>
     </Compile>
-    <Compile Include="config\SNES\SNESOptions.cs" />
+    <Compile Include="config\SNES\SNESOptions.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="config\SNES\SNESOptions.Designer.cs">
       <DependentUpon>SNESOptions.cs</DependentUpon>
     </Compile>
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 9670478635..63795c6c25 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1195,7 +1195,7 @@ namespace BizHawk.Client.EmuHawk
 		private void CreateDualGbXmlMenuItem_Click(object sender, EventArgs e)
 		{
 			GlobalWin.Sound.StopSound();
-			using (var dlg = new GBtools.DualGBXMLCreator())
+			using (var dlg = new DualGBXMLCreator())
 			{
 				dlg.ShowDialog(this);
 			}
@@ -1547,14 +1547,14 @@ namespace BizHawk.Client.EmuHawk
 				var gb = Global.Emulator as Gameboy;
 				if (gb.IsCGBMode())
 				{
-					if (GBtools.CGBColorChooserForm.DoCGBColorChooserFormDialog(this))
+					if (CGBColorChooserForm.DoCGBColorChooserFormDialog(this))
 					{
 						gb.SetCGBColors(Global.Config.CGBColors);
 					}
 				}
 				else
 				{
-					GBtools.ColorChooserForm.DoColorChooserFormDialog(gb.ChangeDMGColors, this);
+					ColorChooserForm.DoColorChooserFormDialog(gb.ChangeDMGColors, this);
 				}
 			}
 		}
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index d7e81a2a1e..01ebafa4b9 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3350,7 +3350,7 @@ namespace BizHawk.Client.EmuHawk
 										{
 											using (StreamReader f = new StreamReader(Global.Config.GB_PaletteFile))
 											{
-												int[] colors = GBtools.ColorChooserForm.LoadPalFile(f);
+												int[] colors = ColorChooserForm.LoadPalFile(f);
 												if (colors != null)
 													gb.ChangeDMGColors(colors);
 											}
diff --git a/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.Designer.cs b/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.Designer.cs
index affdf7a4c8..7537d860cf 100644
--- a/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.Designer.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Client.EmuHawk.GBtools
+namespace BizHawk.Client.EmuHawk
 {
 	partial class CGBColorChooserForm
 	{
diff --git a/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs b/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs
index 981e4220c6..796525ab4f 100644
--- a/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs
+++ b/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs
@@ -5,7 +5,7 @@ using BizHawk.Emulation.Consoles.GB;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.Client.EmuHawk.GBtools
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class CGBColorChooserForm : Form
 	{
diff --git a/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs b/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs
index f73897f077..25be225e07 100644
--- a/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Client.EmuHawk.GBtools
+namespace BizHawk.Client.EmuHawk
 {
 	partial class ColorChooserForm
 	{
diff --git a/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs b/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs
index 53b66df946..dbf5d74ab7 100644
--- a/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs
+++ b/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs
@@ -6,7 +6,7 @@ using System.IO;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.Client.EmuHawk.GBtools
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class ColorChooserForm : Form
 	{
diff --git a/BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.Designer.cs b/BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.Designer.cs
index f8aef16748..319895cb31 100644
--- a/BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.Designer.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Client.EmuHawk.GBtools
+namespace BizHawk.Client.EmuHawk
 {
 	partial class DualGBFileSelector
 	{
diff --git a/BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.cs b/BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.cs
index 06053c6877..00c33028ae 100644
--- a/BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.cs
+++ b/BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.cs
@@ -9,7 +9,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 
-namespace BizHawk.Client.EmuHawk.GBtools
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class DualGBFileSelector : UserControl
 	{
diff --git a/BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.Designer.cs b/BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.Designer.cs
index a482461c78..80b45dc0f7 100644
--- a/BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.Designer.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Client.EmuHawk.GBtools
+namespace BizHawk.Client.EmuHawk
 {
 	partial class DualGBXMLCreator
 	{
@@ -29,9 +29,9 @@
 		private void InitializeComponent()
 		{
             this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.dualGBFileSelector1 = new BizHawk.Client.EmuHawk.GBtools.DualGBFileSelector();
+            this.dualGBFileSelector1 = new DualGBFileSelector();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.dualGBFileSelector2 = new BizHawk.Client.EmuHawk.GBtools.DualGBFileSelector();
+            this.dualGBFileSelector2 = new DualGBFileSelector();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
             this.textBoxName = new System.Windows.Forms.TextBox();
             this.buttonOK = new System.Windows.Forms.Button();
diff --git a/BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.cs b/BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.cs
index 315c65e738..c78c86744a 100644
--- a/BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.cs
+++ b/BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.cs
@@ -8,7 +8,7 @@ using System.Text;
 using System.Windows.Forms;
 using System.IO;
 
-namespace BizHawk.Client.EmuHawk.GBtools
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class DualGBXMLCreator : Form
 	{