diff --git a/.github/workflows/build-branch-for-web.yaml b/.github/workflows/build-branch-for-web.yaml
index b3b54bc1..c5c13d41 100644
--- a/.github/workflows/build-branch-for-web.yaml
+++ b/.github/workflows/build-branch-for-web.yaml
@@ -49,6 +49,6 @@ jobs:
         with:
           name: Z2Randomizer-${{ inputs.version }}-${{ matrix.platform.name }}
           path: |
-            CrossPlatformUI.Browser/bin/Release/net10.0-browser/browser-wasm/AppBundle/
+            CrossPlatformUI.Browser/bin/Release/net10.0-browser/publish
             !**/*.pdb
 
diff --git a/CrossPlatformUI.Browser/.gitignore b/CrossPlatformUI.Browser/.gitignore
index 8c1ebcff..5112f3f6 100644
--- a/CrossPlatformUI.Browser/.gitignore
+++ b/CrossPlatformUI.Browser/.gitignore
@@ -1 +1,5 @@
+wwwroot/Asm
+wwwroot/js65
+wwwroot/Sprites
 wwwroot/ips-manifest.txt
+wwwroot/PalaceRooms.json
diff --git a/CrossPlatformUI.Browser/CrossPlatformUI.Browser.csproj b/CrossPlatformUI.Browser/CrossPlatformUI.Browser.csproj
index 907839cb..87806e32 100644
--- a/CrossPlatformUI.Browser/CrossPlatformUI.Browser.csproj
+++ b/CrossPlatformUI.Browser/CrossPlatformUI.Browser.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WebAssembly">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net10.0-browser</TargetFramework>
@@ -17,8 +17,11 @@
         <Configurations>Debug;Release;Unsafe Debug</Configurations>
 
         <Platforms>AnyCPU</Platforms>
-<!--        <TrimMode>partial</TrimMode>-->
+        <TrimMode>partial</TrimMode>
 <!--        <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>-->
+
+		<CompressionEnabled>false</CompressionEnabled>
+		<BlazorEnableCompression>false</BlazorEnableCompression>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -44,17 +47,35 @@
     <ItemGroup>
         <WasmExtraFilesToDeploy Include="wwwroot\**" />
     </ItemGroup>
-    <ItemGroup>
-        <WasmExtraFilesToDeploy Include="..\RandomizerCore\Sprites\**" TargetPath="Sprites\%(Filename)%(Extension)" />
-        <WasmExtraFilesToDeploy Include="..\RandomizerCore\PalaceRooms.json" />
-        <WasmExtraFilesToDeploy Include="..\RandomizerCore\Asm\**" TargetPath="Asm\%(RecursiveDir)\%(Filename)%(Extension)" />
-    </ItemGroup>
+    <Target Name="CopyAssetsToLocalWwwRoot" BeforeTargets="BeforeBuild;AssignTargetPaths">
+        <ItemGroup>
+            <!-- Define the external source items -->
+            <ExternalSprites Include="..\RandomizerCore\Sprites\**" />
+            <ExternalJson Include="..\RandomizerCore\PalaceRooms.json" />
+            <ExternalAsm Include="..\RandomizerCore\Asm\**" />
+
+            <!-- Tell Visual Studio to watch them for changes -->
+            <UpToDateCheckInput Include="@(ExternalSprites);@(ExternalJson);@(ExternalAsm)" />
+        </ItemGroup>
+
+        <Copy SourceFiles="@(ExternalSprites)"
+              DestinationFiles="@(ExternalSprites -> 'wwwroot\Sprites\%(RecursiveDir)%(Filename)%(Extension)')"
+              SkipUnchangedFiles="true" />
+        <Copy SourceFiles="@(ExternalJson)"
+              DestinationFiles="wwwroot\PalaceRooms.json"
+              SkipUnchangedFiles="true" />
+        <Copy SourceFiles="@(ExternalAsm)"
+              DestinationFiles="@(ExternalAsm -> 'wwwroot\Asm\%(RecursiveDir)%(Filename)%(Extension)')"
+              SkipUnchangedFiles="true" />
+    </Target>
+
     <ItemGroup>
         <IpsFiles Include="..\RandomizerCore\Sprites\*.ips" />
     </ItemGroup>
     <ItemGroup>
       <None Remove="wwwroot\index.html" />
     </ItemGroup>
+    
     <Target Name="GenerateIpsManifest" AfterTargets="Build">
         <WriteLinesToFile
             File="wwwroot\ips-manifest.txt"
@@ -62,9 +83,16 @@
             Overwrite="true" />
     </Target>
 
+    <Target Name="CopyJs65Assets" AfterTargets="ResolvePackageAssets">
+        <ItemGroup>
+            <Js65Files Include="$(Pkgjs65_browser)\assets\js65\**\*.*" />
+        </ItemGroup>
+        <Copy SourceFiles="@(Js65Files)" DestinationFolder="$(MSBuildProjectDirectory)\wwwroot\js65\%(RecursiveDir)" SkipUnchangedFiles="true" />
+    </Target>
+
     <ItemGroup>
         <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="js65.browser" Version="$(Js65Version)" />
+        <PackageReference Include="js65.browser" Version="$(Js65Version)" GeneratePathProperty="true" />
     </ItemGroup>
 
     <ItemGroup>
@@ -74,8 +102,4 @@
     <ItemGroup>
         <ProjectReference Include="..\CrossPlatformUI\CrossPlatformUI.csproj" />
     </ItemGroup>
-
-<!--    <ItemGroup>-->
-<!--        <TrimmerRootAssembly Include="RandomizerCore" />-->
-<!--    </ItemGroup>-->
 </Project>
diff --git a/CrossPlatformUI.Browser/wwwroot/main.js b/CrossPlatformUI.Browser/wwwroot/main.js
index f315d374..2075f264 100644
--- a/CrossPlatformUI.Browser/wwwroot/main.js
+++ b/CrossPlatformUI.Browser/wwwroot/main.js
@@ -26,6 +26,12 @@ function showError(msg) {
     // identify runtime/assembly payloads
     const isBootResource = (url, res) => {
         const u = (typeof url === "string" ? url : url.url || "").toLowerCase();
+        
+        // Skip hot reload endpoints entirely
+        if (u.includes("hotreload")) {
+            return false;
+        }
+
         const ext = /\.(wasm|dll|pdb|dat|gz|br|json|blat|bundle)$/.test(u);
         const frameworkPath = u.includes("/_framework/") || u.includes("dotnet.") || u.includes("icudt");
         const ct = res?.headers?.get("content-type") || "";