diff --git a/.github/workflows/nuget-static-graphics.yml b/.github/workflows/nuget-static-graphics.yml
index f30263a..a495062 100644
--- a/.github/workflows/nuget-static-graphics.yml
+++ b/.github/workflows/nuget-static-graphics.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Install native build dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y clang lld llvm ninja-build pkg-config libfontconfig1-dev
+          sudo apt-get install -y clang lld llvm ninja-build pkg-config libfontconfig1-dev libglib2.0-dev
 
       - name: Build Linux static graphics libraries
         env:
@@ -170,7 +170,7 @@ jobs:
           done
 
       - name: Pack NuGet package
-        run: dotnet pack NuGet/LinuxStaticGraphics/Greepar.Avalonia.StaticGraphics.csproj -c Release -o artifacts/nuget
+        run: dotnet pack NuGet/StaticGraphics/Greepar.Avalonia.StaticGraphics.csproj -c Release -o artifacts/nuget
 
       - name: Upload NuGet artifact
         uses: actions/upload-artifact@v4
diff --git a/External/NativeStatic/README.md b/External/NativeStatic/README.md
new file mode 100644
index 0000000..2fe5b82
--- /dev/null
+++ b/External/NativeStatic/README.md
@@ -0,0 +1,16 @@
+# Native Static Outputs
+
+GitHub Actions writes platform static libraries here before packing the NuGet package.
+
+Expected generated layout:
+
+```text
+External/NativeStatic/win-x64/native inputs
+External/NativeStatic/win-arm64/native inputs
+External/NativeStatic/linux-x64/native inputs
+External/NativeStatic/linux-arm64/native inputs
+External/NativeStatic/osx-x64/native inputs
+External/NativeStatic/osx-arm64/native inputs
+```
+
+The repository keeps build patches here, but platform `.a` and `.lib` outputs are generated by the workflow and are not source files.
diff --git a/External/NativeStatic/linux-x64/libANGLE_static.a b/External/NativeStatic/linux-x64/libANGLE_static.a
deleted file mode 100644
index 11ab2b5..0000000
Binary files a/External/NativeStatic/linux-x64/libANGLE_static.a and /dev/null differ
diff --git a/External/NativeStatic/linux-x64/libGLESv2_static.a b/External/NativeStatic/linux-x64/libGLESv2_static.a
deleted file mode 100644
index 5ac5e06..0000000
Binary files a/External/NativeStatic/linux-x64/libGLESv2_static.a and /dev/null differ
diff --git a/External/NativeStatic/linux-x64/libHarfBuzzSharp.a b/External/NativeStatic/linux-x64/libHarfBuzzSharp.a
deleted file mode 100644
index 6289599..0000000
Binary files a/External/NativeStatic/linux-x64/libHarfBuzzSharp.a and /dev/null differ
diff --git a/External/NativeStatic/linux-x64/libSkiaSharp.a b/External/NativeStatic/linux-x64/libSkiaSharp.a
deleted file mode 100644
index e319def..0000000
Binary files a/External/NativeStatic/linux-x64/libSkiaSharp.a and /dev/null differ
diff --git a/External/NativeStatic/linux-x64/libskia.a b/External/NativeStatic/linux-x64/libskia.a
deleted file mode 100644
index 57d1cba..0000000
Binary files a/External/NativeStatic/linux-x64/libskia.a and /dev/null differ
diff --git a/NuGet/LinuxStaticGraphics/Greepar.Avalonia.StaticGraphics.csproj b/NuGet/StaticGraphics/Greepar.Avalonia.StaticGraphics.csproj
similarity index 100%
rename from NuGet/LinuxStaticGraphics/Greepar.Avalonia.StaticGraphics.csproj
rename to NuGet/StaticGraphics/Greepar.Avalonia.StaticGraphics.csproj
diff --git a/NuGet/LinuxStaticGraphics/README.md b/NuGet/StaticGraphics/README.md
similarity index 97%
rename from NuGet/LinuxStaticGraphics/README.md
rename to NuGet/StaticGraphics/README.md
index 43dc51e..0609116 100644
--- a/NuGet/LinuxStaticGraphics/README.md
+++ b/NuGet/StaticGraphics/README.md
@@ -104,7 +104,7 @@ Build scripts:
 Build locally after the static archives exist:
 
 ```bash
-dotnet pack NuGet/LinuxStaticGraphics/Greepar.Avalonia.StaticGraphics.csproj -c Release -o artifacts/nuget
+dotnet pack NuGet/StaticGraphics/Greepar.Avalonia.StaticGraphics.csproj -c Release -o artifacts/nuget
 ```
 
 The package will be written to:
diff --git a/NuGet/LinuxStaticGraphics/buildTransitive/Greepar.Avalonia.StaticGraphics.props b/NuGet/StaticGraphics/buildTransitive/Greepar.Avalonia.StaticGraphics.props
similarity index 100%
rename from NuGet/LinuxStaticGraphics/buildTransitive/Greepar.Avalonia.StaticGraphics.props
rename to NuGet/StaticGraphics/buildTransitive/Greepar.Avalonia.StaticGraphics.props
diff --git a/NuGet/LinuxStaticGraphics/buildTransitive/Greepar.Avalonia.StaticGraphics.targets b/NuGet/StaticGraphics/buildTransitive/Greepar.Avalonia.StaticGraphics.targets
similarity index 100%
rename from NuGet/LinuxStaticGraphics/buildTransitive/Greepar.Avalonia.StaticGraphics.targets
rename to NuGet/StaticGraphics/buildTransitive/Greepar.Avalonia.StaticGraphics.targets
diff --git a/README.md b/README.md
index 43dc51e..0609116 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ Build scripts:
 Build locally after the static archives exist:
 
 ```bash
-dotnet pack NuGet/LinuxStaticGraphics/Greepar.Avalonia.StaticGraphics.csproj -c Release -o artifacts/nuget
+dotnet pack NuGet/StaticGraphics/Greepar.Avalonia.StaticGraphics.csproj -c Release -o artifacts/nuget
 ```
 
 The package will be written to:
diff --git a/scripts/build-windows-static-graphics.ps1 b/scripts/build-windows-static-graphics.ps1
index 1e50481..d188650 100644
--- a/scripts/build-windows-static-graphics.ps1
+++ b/scripts/build-windows-static-graphics.ps1
@@ -112,7 +112,14 @@ extra_cflags_cc = [ "/GR" ]
 
     Copy-FirstExisting (Join-Path $OutputDir "skia.lib") @((Join-Path $outDir "skia.lib"), (Join-Path $outDir "obj\skia.lib"))
     Copy-FirstExisting (Join-Path $OutputDir "SkiaSharp.lib") @((Join-Path $outDir "SkiaSharp.lib"), (Join-Path $outDir "obj\SkiaSharp.lib"))
-    Copy-FirstExisting (Join-Path $OutputDir "libHarfBuzzSharp.lib") @((Join-Path $outDir "libHarfBuzzSharp.lib"), (Join-Path $outDir "obj\libHarfBuzzSharp.lib"))
+    Copy-FirstExisting (Join-Path $OutputDir "libHarfBuzzSharp.lib") @(
+        (Join-Path $outDir "libHarfBuzzSharp.lib"),
+        (Join-Path $outDir "HarfBuzzSharp.lib"),
+        (Join-Path $outDir "obj\libHarfBuzzSharp.lib"),
+        (Join-Path $outDir "obj\HarfBuzzSharp.lib"),
+        (Join-Path $outDir "obj\HarfBuzzSharp\libHarfBuzzSharp.lib"),
+        (Join-Path $outDir "obj\HarfBuzzSharp\HarfBuzzSharp.lib")
+    )
 }
 
 function Sync-Angle {