diff --git a/Kyoo.Authentication/Extensions.cs b/Kyoo.Authentication/Extensions.cs
index 9b7f3bcd..870cb6ab 100644
--- a/Kyoo.Authentication/Extensions.cs
+++ b/Kyoo.Authentication/Extensions.cs
@@ -28,7 +28,7 @@ namespace Kyoo.Authentication
 		}
 
 		/// <summary>
-		/// Convert a user to an <see cref="IdentityServerUser"/>.
+		/// Convert a user to an IdentityServerUser.
 		/// </summary>
 		/// <param name="user">The user to convert.</param>
 		/// <returns>The corresponding identity server user.</returns>
diff --git a/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.csproj b/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.csproj
index dffd572f..a1b456db 100644
--- a/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.csproj
+++ b/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.csproj
@@ -1,12 +1,43 @@
-<Project>
+<Project ToolsVersion="Current">
 	<PropertyGroup>
-		<ProjectGuid>{98851001-40DD-46A6-94B3-2F8D90722076}</ProjectGuid>
+		<IsWindows Condition="$([MSBuild]::IsOSPlatform('Windows'))">true</IsWindows>
 	</PropertyGroup>
 
-	<Import Project="Kyoo.Host.WindowsTrait.target" Condition="$(IsWindows) == true" />
-	<Import Project="Kyoo.Host.WindowsTrait.linux.target" Condition="$(IsWindows) != true" />
+	<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
-	<ItemGroup>
-		<None Remove="*.target" />
+	<PropertyGroup Condition="$(IsWindows) == true">
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net5.0-windows</TargetFramework>
+		<UseWindowsForms>true</UseWindowsForms>
+		<RootNamespace>Kyoo.WindowsHost</RootNamespace>
+	</PropertyGroup>
+	<ItemGroup Condition="$(IsWindows) == true">
+		<ProjectReference Include="../Kyoo.Core/Kyoo.Core.csproj" />
+		<ProjectReference Include="../Kyoo.Host.Console/Kyoo.Host.Console.csproj" Condition="$(IncludeConsole) == true" />
+
+		<None Remove="kyoo.ico" />
+		<Content Include="kyoo.ico">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+
+	<PropertyGroup Condition="$(IsWindows) != true">
+		<TargetFramework>net5.0</TargetFramework>
+		<NoWarn>NU1503</NoWarn>
+	</PropertyGroup>
+
+	<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
+	<Target Name="Build" Condition="$(IsWindows) != true">
+		<Message Importance="high" Text="Detected current operating system is not windows, skipping WindowsHost build." />
+	</Target>
+	<Target Name="Clean" Condition="$(IsWindows) != true" />
+	<Target Name="Pack" Condition="$(IsWindows) != true" />
+	<Target Name="Restore" Condition="$(IsWindows) != true" />
+	<Target Name="Publish" Condition="$(IsWindows) != true" />
+
+	<ItemGroup Condition="$(IsWindows) != true">
+		<None Include="@(Compile)" Visible="true" />
+		<Compile Remove="*" />
 	</ItemGroup>
 </Project>
diff --git a/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.linux.target b/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.linux.target
deleted file mode 100644
index 99c68350..00000000
--- a/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.linux.target
+++ /dev/null
@@ -1,26 +0,0 @@
-<Project>
-	<!-- Project file used instead of the default csproj when the host system is not windows. This only skip the build. -->
-
-	<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-	<PropertyGroup>
-		<TargetFramework>net5.0</TargetFramework>
-		<NoWarn>NU1503</NoWarn>
-	</PropertyGroup>
-
-	<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-	<Target Name="Build">
-		<Message Importance="high" Text="Detected current operating system is not windows, skipping WindowsHost build." />
-	</Target>
-
-	<Target Name="Clean" />
-	<Target Name="Pack" />
-	<Target Name="Restore" />
-	<Target Name="Publish" />
-
-	<ItemGroup>
-		<None Include="@(Compile)" Visible="true" />
-		<Compile Remove="*" />
-	</ItemGroup>
-</Project>
diff --git a/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.target b/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.target
deleted file mode 100644
index 1989bbdb..00000000
--- a/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.target
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<!-- Project file used instead of the default csproj when the host system is windows. 
-	     This is the real csproj used to compile the project.
-	 -->
-
-	<PropertyGroup>
-		<OutputType>WinExe</OutputType>
-		<TargetFramework>net5.0-windows</TargetFramework>
-		<UseWindowsForms>true</UseWindowsForms>
-		<RootNamespace>Kyoo.WindowsHost</RootNamespace>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="../Kyoo.Core/Kyoo.Core.csproj" />
-		<ProjectReference Include="../Kyoo.Host.Console/Kyoo.Host.Console.csproj" Condition="$(IncludeConsole) == true" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<None Remove="kyoo.ico"/>
-		<Content Include="kyoo.ico">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
-</Project>
diff --git a/Kyoo.Host.WindowsTrait/SystemTrait.cs b/Kyoo.Host.WindowsTrait/SystemTrait.cs
index bf0ea282..d46a132a 100644
--- a/Kyoo.Host.WindowsTrait/SystemTrait.cs
+++ b/Kyoo.Host.WindowsTrait/SystemTrait.cs
@@ -25,13 +25,12 @@ namespace Kyoo.Host.WindowsTrait
 		/// The options containing the <see cref="BasicOptions.PublicUrl"/>.
 		/// </summary>
 		private readonly IOptions<BasicOptions> _options;
-		
+
 		/// <summary>
 		/// The thread where the trait is running.
 		/// </summary>
 		private Thread _thread;
-		
-		
+
 		/// <summary>
 		/// Create a new <see cref="SystemTrait"/>.
 		/// </summary>
@@ -42,7 +41,7 @@ namespace Kyoo.Host.WindowsTrait
 			_application = application;
 			_options = options;
 		}
-		
+
 		/// <inheritdoc />
 		public void Start()
 		{
@@ -73,12 +72,12 @@ namespace Kyoo.Host.WindowsTrait
 			private readonly IApplication _application;
 
 			/// <summary>
-            /// The options containing the <see cref="BasicOptions.PublicUrl"/>.
-            /// </summary>
+			/// The options containing the <see cref="BasicOptions.PublicUrl"/>.
+			/// </summary>
 			private readonly IOptions<BasicOptions> _options;
-			
+
 			/// <summary>
-			/// The Icon that is displayed in the window's bar. 
+			/// The Icon that is displayed in the window's bar.
 			/// </summary>
 			private readonly NotifyIcon _icon;
 
@@ -95,10 +94,12 @@ namespace Kyoo.Host.WindowsTrait
 				AppDomain.CurrentDomain.ProcessExit += (_, _) => Dispose();
 				System.Windows.Forms.Application.ApplicationExit += (_, _) => Dispose();
 
-				_icon = new NotifyIcon();
-				_icon.Text = "Kyoo";
-				_icon.Icon = new Icon(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "kyoo.ico"));
-				_icon.Visible = true;
+				_icon = new NotifyIcon
+				{
+					Text = "Kyoo",
+					Icon = new Icon(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "kyoo.ico")),
+					Visible = true
+				};
 				_icon.MouseClick += (_, e) =>
 				{
 					if (e.Button != MouseButtons.Left)
@@ -160,4 +161,4 @@ namespace Kyoo.Host.WindowsTrait
 			}
 		}
 	}
-}
\ No newline at end of file
+}