diff --git a/BaseHandlers/BaseHandlers.csproj b/BaseHandlers/BaseHandlers.csproj
index 0777901..011fde8 100644
--- a/BaseHandlers/BaseHandlers.csproj
+++ b/BaseHandlers/BaseHandlers.csproj
@@ -13,13 +13,9 @@
     <ProjectReference Include="..\MathLib\MathLib.csproj" />
     <ProjectReference Include="..\ModelViewer\ModelViewer.csproj" />
     <ProjectReference Include="..\PluginAPI\PluginAPI.csproj" />
-    <ProjectReference Include="..\VehicleList\VehicleList.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="DebugHelper" Version="1.0.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="2.1.12" />
   </ItemGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)BundleManager\bin\$(ConfigurationName)\$(TargetFramework)\plugins\&quot; /s /e /y" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/BundleManager/BundleManager.csproj b/BundleManager/BundleManager.csproj
index 7aebc1c..54bbc16 100644
--- a/BundleManager/BundleManager.csproj
+++ b/BundleManager/BundleManager.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -16,7 +15,6 @@
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
@@ -31,6 +29,9 @@
   <PropertyGroup>
     <ApplicationManifest>App.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Update="BetterListView.cs">
       <SubType>Component</SubType>
@@ -39,40 +40,69 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="icon.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="DebugHelper" Version="1.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="ScottPlot.WinForms" Version="5.0.54" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.12" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BundleFormat\BundleFormat.csproj" />
     <ProjectReference Include="..\BundleUtilities\BundleUtilities.csproj" />
     <ProjectReference Include="..\BurnoutImage\BurnoutImage.csproj" />
     <ProjectReference Include="..\HexEditor\HexEditor.csproj" />
-    <ProjectReference Include="..\IconLibrary\IconLibrary.csproj" />
     <ProjectReference Include="..\LangEditor\LangEditor.csproj" />
-    <ProjectReference Include="..\MathLib\MathLib.csproj" />
-    <ProjectReference Include="..\ModelViewer\ModelViewer.csproj" />
     <ProjectReference Include="..\PluginAPI\PluginAPI.csproj" />
     <ProjectReference Include="..\PluginSystem\PluginSystem.csproj" />
   </ItemGroup>
+  <Target Name="Plugins" BeforeTargets="Build">
+    <ItemGroup>
+      <PluginFiles Include="..\BaseHandlers\bin\$(Configuration)\$(TargetFramework)\BaseHandlers.dll;
+                            ..\BaseHandlers\bin\$(Configuration)\$(TargetFramework)\BaseHandlers.pdb;
+                            ..\LangEditor\bin\$(Configuration)\$(TargetFramework)\LangEditor.dll;
+                            ..\LangEditor\bin\$(Configuration)\$(TargetFramework)\LangEditor.pdb;
+                            ..\LoopModel\bin\$(Configuration)\$(TargetFramework)\LoopModel.dll;
+                            ..\LoopModel\bin\$(Configuration)\$(TargetFramework)\LoopModel.pdb;
+                            ..\LuaList\bin\$(Configuration)\$(TargetFramework)\LuaList.dll;
+                            ..\LuaList\bin\$(Configuration)\$(TargetFramework)\LuaList.pdb;
+                            ..\PVSFormat\bin\$(Configuration)\$(TargetFramework)\PVSFormat.dll;
+                            ..\PVSFormat\bin\$(Configuration)\$(TargetFramework)\PVSFormat.pdb;
+                            ..\VaultFormat\bin\$(Configuration)\$(TargetFramework)\VaultFormat.dll;
+                            ..\VaultFormat\bin\$(Configuration)\$(TargetFramework)\VaultFormat.pdb;
+                            ..\VehicleList\bin\$(Configuration)\$(TargetFramework)\VehicleList.dll;
+                            ..\VehicleList\bin\$(Configuration)\$(TargetFramework)\VehicleList.pdb;
+                            ..\WheelList\bin\$(Configuration)\$(TargetFramework)\WheelList.dll;
+                            ..\WheelList\bin\$(Configuration)\$(TargetFramework)\WheelList.pdb;
+                            ..\WorldCollisionHandler\bin\$(Configuration)\$(TargetFramework)\WorldCollisionHandler.dll;
+                            ..\WorldCollisionHandler\bin\$(Configuration)\$(TargetFramework)\WorldCollisionHandler.pdb" />
+    </ItemGroup>
+    <Copy SourceFiles="@(PluginFiles)"
+          DestinationFolder="$(OutputPath)plugins"
+          SkipUnchangedFiles="true" />
+  </Target>
   <ItemGroup>
-    <Content Include="icon.ico" />
+    <ShaderFiles Include="$(SolutionDir)resources\Shaders\**\*.*" />
   </ItemGroup>
+  <Target Name="Shaders" AfterTargets="Build">
+    <Copy SourceFiles="@(ShaderFiles)"
+          DestinationFolder="$(OutputPath)Shaders"
+          SkipUnchangedFiles="true" />
+  </Target>
   <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.5.2 %28x86 und x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
+    <Content Include="$(OutputPath)plugins\*.dll">
+      <Link>plugins\%(FileName)%(Extension)</Link>
+      <PublishState>Include</PublishState>
+      <Visible>false</Visible>
+    </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DebugHelper" Version="1.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="ScottPlot.WinForms" Version="5.0.54" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.12" />
+    <None Include="..\LangEditor\keys\**\*.*">
+      <Visible>false</Visible>
+      <Link>keys\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(SolutionDir)libs\*&quot; &quot;$(ProjectDir)$(OutDir)&quot; /s /e /y&#xD;&#xA;xcopy &quot;$(SolutionDir)resources\*&quot; &quot;$(ProjectDir)$(OutDir)&quot; /s /e /y" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/LangEditor/LangEditor.csproj b/LangEditor/LangEditor.csproj
index c5a62a0..364a13b 100644
--- a/LangEditor/LangEditor.csproj
+++ b/LangEditor/LangEditor.csproj
@@ -11,33 +11,4 @@
     <ProjectReference Include="..\BundleUtilities\BundleUtilities.csproj" />
     <ProjectReference Include="..\PluginAPI\PluginAPI.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <None Update="keys\_all.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="keys\ids\challenges.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="keys\ids\drivethrus.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="keys\ids\events.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="keys\ids\roads.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="keys\ids\vehicles.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="keys\keys.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="keys\unsorted.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)BundleManager\bin\$(ConfigurationName)\$(TargetFramework)\plugins\&quot; /s /e /y" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/LoopModel/LoopModel.csproj b/LoopModel/LoopModel.csproj
index ce3ee0e..ca3b317 100644
--- a/LoopModel/LoopModel.csproj
+++ b/LoopModel/LoopModel.csproj
@@ -1,32 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
   </PropertyGroup>
-
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)BundleManager\bin\$(ConfigurationName)\$(TargetFramework)\plugins\&quot; /s /e /y" />
-  </Target>
-
   <ItemGroup>
     <PackageReference Include="ScottPlot.WinForms" Version="5.0.54" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\BundleFormat\BundleFormat.csproj" />
     <ProjectReference Include="..\BundleUtilities\BundleUtilities.csproj" />
     <ProjectReference Include="..\PluginAPI\PluginAPI.csproj" />
   </ItemGroup>
-
 </Project>
diff --git a/LuaList/LuaList.csproj b/LuaList/LuaList.csproj
index e1909cd..364a13b 100644
--- a/LuaList/LuaList.csproj
+++ b/LuaList/LuaList.csproj
@@ -6,16 +6,9 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
   </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\BundleFormat\BundleFormat.csproj" />
     <ProjectReference Include="..\BundleUtilities\BundleUtilities.csproj" />
     <ProjectReference Include="..\PluginAPI\PluginAPI.csproj" />
-    <ProjectReference Include="..\VehicleList\VehicleList.csproj" />
   </ItemGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)BundleManager\bin\$(ConfigurationName)\$(TargetFramework)\plugins\&quot; /s /e /y" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/PVSFormat/PVSFormat.csproj b/PVSFormat/PVSFormat.csproj
index a1869a5..780ec95 100644
--- a/PVSFormat/PVSFormat.csproj
+++ b/PVSFormat/PVSFormat.csproj
@@ -21,7 +21,4 @@
     <PackageReference Include="DebugHelper" Version="1.0.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="2.1.12" />
   </ItemGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)BundleManager\bin\$(ConfigurationName)\$(TargetFramework)\plugins\&quot; /s /e /y" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/PluginSystem/PluginSystem.csproj b/PluginSystem/PluginSystem.csproj
index 84bbf94..e3028d7 100644
--- a/PluginSystem/PluginSystem.csproj
+++ b/PluginSystem/PluginSystem.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\BundleUtilities\BundleUtilities.csproj" />
+    <ProjectReference Include="..\MathLib\MathLib.csproj" />
     <ProjectReference Include="..\PluginAPI\PluginAPI.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VaultFormat/VaultFormat.csproj b/VaultFormat/VaultFormat.csproj
index 780a5e9..bacf522 100644
--- a/VaultFormat/VaultFormat.csproj
+++ b/VaultFormat/VaultFormat.csproj
@@ -19,7 +19,4 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)BundleManager\bin\$(ConfigurationName)\$(TargetFramework)\plugins\&quot; /s /e /y" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/VehicleList/VehicleList.csproj b/VehicleList/VehicleList.csproj
index 8577e88..f3d2e65 100644
--- a/VehicleList/VehicleList.csproj
+++ b/VehicleList/VehicleList.csproj
@@ -24,7 +24,4 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)BundleManager\bin\$(ConfigurationName)\$(TargetFramework)\plugins\&quot; /s /e /y" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/WheelList/WheelList.csproj b/WheelList/WheelList.csproj
index 0635ab2..f2e6469 100644
--- a/WheelList/WheelList.csproj
+++ b/WheelList/WheelList.csproj
@@ -1,18 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\BundleFormat\BundleFormat.csproj" />
     <ProjectReference Include="..\BundleUtilities\BundleUtilities.csproj" />
     <ProjectReference Include="..\PluginAPI\PluginAPI.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -20,16 +17,10 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)BundleManager\bin\$(ConfigurationName)\$(TargetFramework)\plugins\&quot; /s /e /y" />
-  </Target>
-
 </Project>
diff --git a/WorldCollisionHandler/WorldCollisionHandler.csproj b/WorldCollisionHandler/WorldCollisionHandler.csproj
index d8a99ba..09f5177 100644
--- a/WorldCollisionHandler/WorldCollisionHandler.csproj
+++ b/WorldCollisionHandler/WorldCollisionHandler.csproj
@@ -17,7 +17,4 @@
     <PackageReference Include="DebugHelper" Version="1.0.0" />
     <PackageReference Include="OpenTK" Version="4.7.7" />
   </ItemGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)BundleManager\bin\$(ConfigurationName)\$(TargetFramework)\plugins\&quot; /s /e /y" />
-  </Target>
 </Project>
\ No newline at end of file