diff --git a/Netplay/SonicRiders.Utils.Netplay.Messages/Riders.Netplay.Messages.csproj b/Netplay/SonicRiders.Utils.Netplay.Messages/Riders.Netplay.Messages.csproj
index c4faa0ba..f47ababd 100644
--- a/Netplay/SonicRiders.Utils.Netplay.Messages/Riders.Netplay.Messages.csproj
+++ b/Netplay/SonicRiders.Utils.Netplay.Messages/Riders.Netplay.Messages.csproj
@@ -6,6 +6,7 @@
     <LangVersion>preview</LangVersion>
 	  <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <LangVersion>preview</LangVersion>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Netplay/SonicRiders.Utils.Netplay.Tests/Riders.Netplay.Messages.Tests.csproj b/Netplay/SonicRiders.Utils.Netplay.Tests/Riders.Netplay.Messages.Tests.csproj
index bafcac70..5e07d7f4 100644
--- a/Netplay/SonicRiders.Utils.Netplay.Tests/Riders.Netplay.Messages.Tests.csproj
+++ b/Netplay/SonicRiders.Utils.Netplay.Tests/Riders.Netplay.Messages.Tests.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net5.0-windows</TargetFramework>
 	  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>preview</LangVersion>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Riders.Tweakbox.CharacterPack.DX/Riders.Tweakbox.CharacterPack.DX.csproj b/Riders.Tweakbox.CharacterPack.DX/Riders.Tweakbox.CharacterPack.DX.csproj
index 3a5ce58e..b5de8e81 100644
--- a/Riders.Tweakbox.CharacterPack.DX/Riders.Tweakbox.CharacterPack.DX.csproj
+++ b/Riders.Tweakbox.CharacterPack.DX/Riders.Tweakbox.CharacterPack.DX.csproj
@@ -9,6 +9,7 @@
     <LangVersion>preview</LangVersion>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <RobustILLink>true</RobustILLink>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
   <Import Project="../Robust.Trimming.targets" />
diff --git a/Riders.Tweakbox.Gearpack/Riders.Tweakbox.Gearpack.csproj b/Riders.Tweakbox.Gearpack/Riders.Tweakbox.Gearpack.csproj
index 865c6bd4..6fb9eb1d 100644
--- a/Riders.Tweakbox.Gearpack/Riders.Tweakbox.Gearpack.csproj
+++ b/Riders.Tweakbox.Gearpack/Riders.Tweakbox.Gearpack.csproj
@@ -9,6 +9,7 @@
     <LangVersion>preview</LangVersion>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <RobustILLink>true</RobustILLink>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
   <Import Project="../Robust.Trimming.targets" />
diff --git a/Riders.Tweakbox/Riders.Tweakbox.csproj b/Riders.Tweakbox/Riders.Tweakbox.csproj
index 0099db9a..662392e1 100644
--- a/Riders.Tweakbox/Riders.Tweakbox.csproj
+++ b/Riders.Tweakbox/Riders.Tweakbox.csproj
@@ -12,6 +12,7 @@
     <LangVersion>preview</LangVersion>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <RobustILLink>false</RobustILLink>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
   <Import Project="../Robust.Trimming.targets" />
diff --git a/Submodules/Sewer56.Imgui/Sewer56.Imgui.csproj b/Submodules/Sewer56.Imgui/Sewer56.Imgui.csproj
index c01fb17f..f9489539 100644
--- a/Submodules/Sewer56.Imgui/Sewer56.Imgui.csproj
+++ b/Submodules/Sewer56.Imgui/Sewer56.Imgui.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net5.0-windows</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>preview</LangVersion>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Submodules/Sewer56.SonicRiders b/Submodules/Sewer56.SonicRiders
index fbe52cda..237fd3f2 160000
--- a/Submodules/Sewer56.SonicRiders
+++ b/Submodules/Sewer56.SonicRiders
@@ -1 +1 @@
-Subproject commit fbe52cda55c4edecb7293c87df3cd463ede81ff9
+Subproject commit 237fd3f26454957d9739c2fcd9d18d70443935f8