diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 575fed4223..86be870a07 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -696,7 +696,7 @@
     <Compile Include="Sound\Utilities\SyncToAsyncProvider.cs" />
     <Compile Include="Sound\Utilities\SoundOutputProvider.cs" />
     <Compile Include="Throttle.cs" />
-    <Compile Include="ToolAttribute.cs" />
+    <Compile Include="ToolAttributes.cs" />
     <Compile Include="tools\AutoHawk.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -855,9 +855,6 @@
     <Compile Include="tools\HexEditor\NewHexEditor.Designer.cs">
       <DependentUpon>NewHexEditor.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\Lua\LuaPictureBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Client.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Console.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.cs" />
@@ -894,6 +891,9 @@
     <Compile Include="tools\Lua\LuaFunctionsForm.Designer.cs">
       <DependentUpon>LuaFunctionsForm.cs</DependentUpon>
     </Compile>
+	<Compile Include="tools\Lua\LuaPictureBox.cs">
+		<SubType>Component</SubType>
+	</Compile>
     <Compile Include="tools\Lua\LuaRegisteredFunctionsList.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1176,8 +1176,7 @@
     <Compile Include="tools\VirtualPads\schema\NesSchema.cs" />
     <Compile Include="tools\VirtualPads\schema\PadSchema.cs" />
     <Compile Include="tools\VirtualPads\schema\PceSchema.cs" />
-    <Compile Include="tools\VirtualPads\schema\SchemaAttribute.cs" />
-    <Compile Include="tools\VirtualPads\schema\SGBSchema.cs" />
+    <Compile Include="tools\VirtualPads\schema\SchemaAttributes.cs" />
     <Compile Include="tools\VirtualPads\schema\SmsSchema.cs" />
     <Compile Include="tools\VirtualPads\schema\SnesSchema.cs" />
     <Compile Include="tools\VirtualPads\schema\VirtualBoySchema.cs" />
@@ -2134,12 +2133,12 @@
     <Folder Include="config\Saturn\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
   <PropertyGroup>
     <PostBuildEvent>
@@ -2153,4 +2152,4 @@
     <PreBuildEvent />
   </PropertyGroup>
   <Import Project="$(SolutionDir)Build\Common.targets" />
-</Project>
+</Project>
\ No newline at end of file