diff --git a/Moonlight.ApiServer/Http/Controllers/OAuth2/OAuth2Controller.cs b/Moonlight.ApiServer/Http/Controllers/OAuth2/OAuth2Controller.cs
index 05c74a28..70ab3a51 100644
--- a/Moonlight.ApiServer/Http/Controllers/OAuth2/OAuth2Controller.cs
+++ b/Moonlight.ApiServer/Http/Controllers/OAuth2/OAuth2Controller.cs
@@ -66,8 +66,6 @@ public partial class OAuth2Controller : Controller
                 parameters.Add("RedirectUri", redirectUri);
                 parameters.Add("ResponseType", responseType);
             });
-
-            await Response.WriteAsync(html);
         }
         else
         {
@@ -77,12 +75,10 @@ public partial class OAuth2Controller : Controller
                 parameters.Add("RedirectUri", redirectUri);
                 parameters.Add("ResponseType", responseType);
             });
-
-            await Response.WriteAsync(html);
         }
         
         await Results
-            .Text(html, "text/html")
+            .Text(html, "text/html", Encoding.UTF8)
             .ExecuteAsync(HttpContext);
     }
 
@@ -158,7 +154,7 @@ public partial class OAuth2Controller : Controller
             }
 
             await Results
-                .Text(html, "text/html")
+                .Text(html, "text/html", Encoding.UTF8)
                 .ExecuteAsync(HttpContext);
         }
     }
diff --git a/Moonlight.Client.Runtime/Moonlight.Client.Runtime.csproj b/Moonlight.Client.Runtime/Moonlight.Client.Runtime.csproj
index 627ac2ce..1c083df3 100644
--- a/Moonlight.Client.Runtime/Moonlight.Client.Runtime.csproj
+++ b/Moonlight.Client.Runtime/Moonlight.Client.Runtime.csproj
@@ -19,52 +19,4 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.5" PrivateAssets="all"/>
     </ItemGroup>
 
-    <ItemGroup>
-      <None Update="Styles\exports.css">
-        <Pack>true</Pack>
-        <PackagePath>styles</PackagePath>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </None>
-      <None Include="Styles\package-lock.json">
-        <Pack>true</Pack>
-        <PackagePath>styles</PackagePath>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </None>
-      <None Include="Styles\package.json">
-        <Pack>true</Pack>
-        <PackagePath>styles</PackagePath>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </None>
-      <None Update="Styles\preTailwind.css">
-        <Pack>true</Pack>
-        <PackagePath>styles</PackagePath>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </None>
-      <None Update="Styles\resolveNuget.js">
-        <Pack>true</Pack>
-        <PackagePath>styles</PackagePath>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </None>
-      <None Update="Styles\style.css">
-        <Pack>true</Pack>
-        <PackagePath>styles</PackagePath>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </None>
-      <None Update="Styles\mappings\mooncore.map">
-        <Pack>true</Pack>
-        <PackagePath>styles</PackagePath>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </None>
-    </ItemGroup>
-
-    <ItemGroup>
-      <Folder Include="wwwroot\css\" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <_ContentIncludedByDefault Remove="wwwroot\js\moonCore.js" />
-      <_ContentIncludedByDefault Remove="wwwroot\js\moonlight.js" />
-      <_ContentIncludedByDefault Remove="wwwroot\svg\logo.svg" />
-    </ItemGroup>
-
 </Project>
diff --git a/Moonlight.Client/Moonlight.Client.csproj b/Moonlight.Client/Moonlight.Client.csproj
index 2decf80b..a04300ce 100644
--- a/Moonlight.Client/Moonlight.Client.csproj
+++ b/Moonlight.Client/Moonlight.Client.csproj
@@ -46,7 +46,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="Styles/*" Pack="true" PackagePath="Styles/Moonlight.Client/" />
+    <None Include="Styles/mappings/*.map" Pack="true" PackagePath="Styles/" />
     <None Include="Moonlight.Client.targets" Pack="true" PackagePath="build/Moonlight.Client.targets" />
   </ItemGroup>
 </Project>
\ No newline at end of file