diff --git a/BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj b/BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj
index 8fbff64de1..fc1a008a2c 100644
--- a/BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj
+++ b/BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj
@@ -368,6 +368,8 @@
     <Compile Include="Consoles\Sega\SMS\VDP.ModeTMS.cs" />
     <Compile Include="Consoles\Sega\SMS\VDP.Mode4.cs" />
     <Compile Include="Consoles\Sega\SMS\VDP.Tables.cs" />
+    <Compile Include="Consoles\Sony\PSP\PPSSPPDll.cs" />
+    <Compile Include="Consoles\Sony\PSP\PSP.cs" />
     <Compile Include="CPUs\68000\Diassembler.cs" />
     <Compile Include="CPUs\68000\Instructions\BitArithemetic.cs" />
     <Compile Include="CPUs\68000\Instructions\DataMovement.cs" />
@@ -419,6 +421,13 @@
     <Compile Include="DiscSystem\CCD_format.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="DiscSystem\cdfs\EndianBitConverter.cs" />
+    <Compile Include="DiscSystem\cdfs\ISODirectoryNode.cs" />
+    <Compile Include="DiscSystem\cdfs\ISOFile.cs" />
+    <Compile Include="DiscSystem\cdfs\ISOFileNode.cs" />
+    <Compile Include="DiscSystem\cdfs\ISONode.cs" />
+    <Compile Include="DiscSystem\cdfs\ISONodeRecord.cs" />
+    <Compile Include="DiscSystem\cdfs\ISOVolumeDescriptor.cs" />
     <Compile Include="DiscSystem\CUE_format.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -429,6 +438,7 @@
     <Compile Include="DiscSystem\Disc.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="DiscSystem\Disc.ID.cs" />
     <Compile Include="DiscSystem\DiscTOC.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
index 5ca920d0fb..2a5232f171 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
@@ -168,12 +168,6 @@
     <Compile Include="config\AutofireConfig.Designer.cs">
       <DependentUpon>AutofireConfig.cs</DependentUpon>
     </Compile>
-    <Compile Include="config\ControllerConfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="config\ControllerConfig.Designer.cs">
-      <DependentUpon>ControllerConfig.cs</DependentUpon>
-    </Compile>
     <Compile Include="config\ControllerConfig\ControllerConfigPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -195,6 +189,12 @@
     <Compile Include="config\MessageConfig.Designer.cs">
       <DependentUpon>MessageConfig.cs</DependentUpon>
     </Compile>
+    <Compile Include="config\NewControllerConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="config\NewControllerConfig.Designer.cs">
+      <DependentUpon>NewControllerConfig.cs</DependentUpon>
+    </Compile>
     <Compile Include="config\PathConfig.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -325,6 +325,7 @@
     <Compile Include="movie\MovieHeader.cs" />
     <Compile Include="movie\MovieImport.cs" />
     <Compile Include="movie\MovieLog.cs" />
+    <Compile Include="movie\MovieMnemonics.cs" />
     <Compile Include="movie\MovieSession.cs" />
     <Compile Include="movie\MultitrackRecording.cs" />
     <Compile Include="movie\Subtitle.cs" />
@@ -336,12 +337,6 @@
       <DependentUpon>SubtitleMaker.cs</DependentUpon>
     </Compile>
     <Compile Include="MruStack.cs" />
-    <Compile Include="N64tools\N64VideoConfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="N64tools\N64VideoConfig.Designer.cs">
-      <DependentUpon>N64VideoConfig.cs</DependentUpon>
-    </Compile>
     <Compile Include="N64tools\N64VideoPluginconfig.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -425,7 +420,9 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SATTools\SaturnPrefs.cs" />
+    <Compile Include="SATTools\SaturnPrefs.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="SATTools\SaturnPrefs.Designer.cs">
       <DependentUpon>SaturnPrefs.cs</DependentUpon>
     </Compile>
@@ -549,6 +546,18 @@
     <Compile Include="tools\VirtualPadGen3Button.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="tools\VirtualPadSaturn.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPadSaturn.Designer.cs">
+      <DependentUpon>VirtualPadSaturn.cs</DependentUpon>
+    </Compile>
+    <Compile Include="tools\VirtualPadSaturnControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="tools\VirtualPadSaturnControl.Designer.cs">
+      <DependentUpon>VirtualPadSaturnControl.cs</DependentUpon>
+    </Compile>
     <Compile Include="tools\VirtualPadSNES.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -569,15 +578,15 @@
     <EmbeddedResource Include="AVOut\VideoWriterChooserForm.resx">
       <DependentUpon>VideoWriterChooserForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="config\ControllerConfig.resx">
-      <DependentUpon>ControllerConfig.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="config\ControllerConfig\ControllerConfigPanel.resx">
       <DependentUpon>ControllerConfigPanel.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="config\GifAnimator.resx">
       <DependentUpon>GifAnimator.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="config\NewControllerConfig.resx">
+      <DependentUpon>NewControllerConfig.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="config\PathInfo.resx">
       <DependentUpon>PathInfo.cs</DependentUpon>
     </EmbeddedResource>
@@ -615,9 +624,6 @@
       <DependentUpon>MainForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="N64tools\N64VideoConfig.resx">
-      <DependentUpon>N64VideoConfig.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="N64tools\N64VideoPluginconfig.resx">
       <DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
     </EmbeddedResource>
@@ -703,6 +709,12 @@
     <EmbeddedResource Include="tools\VirtualPadForm.resx">
       <DependentUpon>VirtualPadForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="tools\VirtualPadSaturn.resx">
+      <DependentUpon>VirtualPadSaturn.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="tools\VirtualPadSaturnControl.resx">
+      <DependentUpon>VirtualPadSaturnControl.cs</DependentUpon>
+    </EmbeddedResource>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>