diff --git a/Nuclex.Avalonia.DependencyInjection b/Nuclex.Avalonia.DependencyInjection
index bb08c44..07435b4 160000
--- a/Nuclex.Avalonia.DependencyInjection
+++ b/Nuclex.Avalonia.DependencyInjection
@@ -1 +1 @@
-Subproject commit bb08c4415a5a56386c515bcb2a077927071f8a11
+Subproject commit 07435b44d8b10900cec8c70581aeb2dd342e7856
diff --git a/nuget-pack.cmd b/nuget-pack.cmd
index df47532..34c7997 100644
--- a/nuget-pack.cmd
+++ b/nuget-pack.cmd
@@ -9,6 +9,11 @@ dotnet build ^
 	--configuration Release ^
 	--no-dependencies
 
+dotnet build ^
+	"Nuclex.Avalonia/Nuclex.Avalonia (netstandard-2.0).csproj" ^
+	--configuration Release ^
+	--no-dependencies
+
 dotnet build ^
 	"Nuclex.Windows.Forms.Ninject/Nuclex.Windows.Forms.Ninject (net-4.6)(net-8.0).csproj" ^
 	--configuration Release ^
@@ -19,17 +24,52 @@ dotnet build ^
 	--configuration Release ^
 	--no-dependencies
 
+dotnet build ^
+	"Nuclex.Avalonia.DependencyInjection/Nuclex.Avalonia.DependencyInjection (netstandard-2.0).csproj" ^
+	--configuration Release ^
+	--no-dependencies
+
+:: ----------------------------------------------------------------------------
+
 nuget pack ^
-	Nuclex.Foundation.nuspec ^
-	-Version 1.2.1 ^
+	nuspecs\Nuclex.Foundation.nuspec ^
+	-Version 1.3.0 ^
 	-Properties Configuration=Release 
 
 nuget pack ^
-	Nuclex.Foundation.Ninject.nuspec ^
-	-Version 1.2.1 ^
+	nuspecs\Nuclex.Mvvm.WinForms.nuspec ^
+	-Version 1.3.0 ^
 	-Properties Configuration=Release 
 
 nuget pack ^
-	Nuclex.Foundation.DependencyInjection.nuspec ^
-	-Version 1.2.1 ^
+	nuspecs\Nuclex.Mvvm.Avalonia.nuspec ^
+	-Version 1.3.0 ^
 	-Properties Configuration=Release 
+
+nuget pack ^
+	nuspecs\Nuclex.Mvvm.WinForms.Ninject.nuspec ^
+	-Version 1.3.0 ^
+	-Properties Configuration=Release 
+
+nuget pack ^
+	nuspecs\Nuclex.Mvvm.Winforms.DependencyInjection.nuspec ^
+	-Version 1.3.0 ^
+	-Properties Configuration=Release 
+
+nuget pack ^
+	nuspecs\Nuclex.Mvvm.Avalonia.DependencyInjection.nuspec ^
+	-Version 1.3.0 ^
+	-Properties Configuration=Release 
+
+echo.
+echo Packages built.
+echo.
+echo Now upload them to NuGet or a local package repository:
+echo.
+echo nuget push Nuclex.Foundation.1.3.0.nupkg -Source nuclex-shared-dotnet -ApiKey api-key
+echo nuget push Nuclex.Mvvm.Avalonia.DependencyInjection.1.3.0.nupkg -Source nuclex-shared-dotnet -ApiKey api-key
+echo nuget push Nuclex.Mvvm.Avalonia.1.3.0.nupkg -Source nuclex-shared-dotnet -ApiKey api-key
+echo nuget push Nuclex.Mvvm.Winforms.DependencyInjection.1.3.0.nupkg -Source nuclex-shared-dotnet -ApiKey api-key
+echo nuget push Nuclex.Mvvm.WinForms.Ninject.1.3.0.nupkg -Source nuclex-shared-dotnet -ApiKey api-key
+echo nuget push Nuclex.Mvvm.WinForms.1.3.0.nupkg -Source nuclex-shared-dotnet -ApiKey api-key
+echo.
diff --git a/nuspecs/Nuclex.Foundation.nuspec b/nuspecs/Nuclex.Foundation.nuspec
index 4a5bc30..a1b89b9 100644
--- a/nuspecs/Nuclex.Foundation.nuspec
+++ b/nuspecs/Nuclex.Foundation.nuspec
@@ -16,12 +16,12 @@
       license keys, collections and observer/subscriber pattern helpers
     </description>
     <language>en-US</language>
-    <tags>mvvm,util</tags>
+    <tags>settings,util,io,observable</tags>
     <icon>nuclex-logo.png</icon>
     <repository
       type="git"
       url="https://github.com/nuclex-shared-dotnet/Nuclex.Support.git"
-      commit="5fb433ad983e58725e0d25faa8968a75b3dfd178"
+      commit="81f9a0acb4fe97d2be327408b94d361bc833d2a8"
     />
     <dependencies>
       <group targetFramework=".NETStandard2.0" />
@@ -32,12 +32,12 @@
   </metadata>
   <files>
 
-    <file src="ReadMe.md" target="ReadMe.md" />
-    <file src="nuclex-logo.png" target="nuclex-logo.png" />
+    <file src="..\ReadMe.md" target="ReadMe.md" />
+    <file src="..\nuclex-logo.png" target="nuclex-logo.png" />
 
     <!-- Feature set for .NET Standard 2.0 (available to ,NET versions from 4.6 onwards) -->
-    <file src="Nuclex.Support\bin\$Configuration$\netstandard2.0\Nuclex.Support.dll" target="lib/netstandard2.0" />
-    <file src="Nuclex.Support\bin\$Configuration$\netstandard2.0\Nuclex.Support.xml" target="lib/netstandard2.0" />
+    <file src="..\Nuclex.Support\bin\$Configuration$\netstandard2.0\Nuclex.Support.dll" target="lib/netstandard2.0" />
+    <file src="..\Nuclex.Support\bin\$Configuration$\netstandard2.0\Nuclex.Support.xml" target="lib/netstandard2.0" />
 
   </files>
 </package>
diff --git a/nuspecs/Nuclex.Mvvm.Avalonia.DependencyInjection.nuspec b/nuspecs/Nuclex.Mvvm.Avalonia.DependencyInjection.nuspec
index fc29ae0..f40783b 100644
--- a/nuspecs/Nuclex.Mvvm.Avalonia.DependencyInjection.nuspec
+++ b/nuspecs/Nuclex.Mvvm.Avalonia.DependencyInjection.nuspec
@@ -16,12 +16,12 @@
       with Nuclex.Windows.Forms (in the Nuclex.Mvvm.WinForms package)
     </description>
     <language>en-US</language>
-    <tags>mvvm,util,ninject,dependency-injection</tags>
+    <tags>mvvm,util,avalonia,dependency-injection</tags>
     <icon>nuclex-logo.png</icon>
     <repository
       type="git"
       url="https://github.com/nuclex-shared-dotnet/Nuclex.Windows.Forms.DependencyInjection.git"
-      commit="573b7ab93d25034a649bdf401f5439ec15c165f5"
+      commit="07435b44d8b10900cec8c70581aeb2dd342e7856"
     />
     <dependencies>
       <group targetFramework=".NETStandard2.0">
@@ -35,12 +35,12 @@
   </metadata>
   <files>
 
-    <file src="ReadMe.md" target="ReadMe.md" />
-    <file src="nuclex-logo.png" target="nuclex-logo.png" />
+    <file src="..\ReadMe.md" target="ReadMe.md" />
+    <file src="..\nuclex-logo.png" target="nuclex-logo.png" />
 
     <!-- Feature set for .NET Standard 2.0 (available to ,NET versions from 4.6 onwards) -->
-    <file src="Nuclex.Avalonia.DependencyInjection\bin\$Configuration$\netstandard2.0\Nuclex.Avalonia.DependencyInjection.dll" target="lib/netstandard2.0" />
-    <file src="Nuclex.AvaloniaDependencyInjection\bin\$Configuration$\netstandard2.0\Nuclex.Avalonia.DependencyInjection.xml" target="lib/netstandard2.0" />
+    <file src="..\Nuclex.Avalonia.DependencyInjection\bin\$Configuration$\netstandard2.0\Nuclex.Avalonia.DependencyInjection.dll" target="lib/netstandard2.0" />
+    <file src="..\Nuclex.Avalonia.DependencyInjection\bin\$Configuration$\netstandard2.0\Nuclex.Avalonia.DependencyInjection.xml" target="lib/netstandard2.0" />
 
   </files>
 </package>
diff --git a/nuspecs/Nuclex.Mvvm.Avalonia.nuspec b/nuspecs/Nuclex.Mvvm.Avalonia.nuspec
index ecf3774..f1a0e2c 100644
--- a/nuspecs/Nuclex.Mvvm.Avalonia.nuspec
+++ b/nuspecs/Nuclex.Mvvm.Avalonia.nuspec
@@ -16,12 +16,12 @@
       automatic view locator and virtualized lazy-loading collections
     </description>
     <language>en-US</language>
-    <tags>mvvm,util</tags>
+    <tags>mvvm,util,avalonia</tags>
     <icon>nuclex-logo.png</icon>
     <repository
       type="git"
       url="https://github.com/nuclex-shared-dotnet/Nuclex.Avalonia.git"
-      commit="5fb433ad983e58725e0d25faa8968a75b3dfd178"
+      commit="26a33a30d296ddf962047a5497e67ca9536c6ae3"
     />
     <dependencies>
       <group targetFramework=".NETStandard2.0">
@@ -36,12 +36,12 @@
   </metadata>
   <files>
 
-    <file src="ReadMe.md" target="ReadMe.md" />
-    <file src="nuclex-logo.png" target="nuclex-logo.png" />
+    <file src="..\ReadMe.md" target="ReadMe.md" />
+    <file src="..\nuclex-logo.png" target="nuclex-logo.png" />
 
     <!-- Feature set for .NET Standard 2.0 (available to ,NET versions from 4.6 onwards) -->
-    <file src="Nuclex.Avalonia\bin\$Configuration$\netstandard2.0\Nuclex.Avalonia.dll" target="lib/netstandard2.0" />
-    <file src="Nuclex.Avalonia\bin\$Configuration$\netstandard2.0\Nuclex.Avalonia.xml" target="lib/netstandard2.0" />
+    <file src="..\Nuclex.Avalonia\bin\$Configuration$\netstandard2.0\Nuclex.Avalonia.dll" target="lib/netstandard2.0" />
+    <file src="..\Nuclex.Avalonia\bin\$Configuration$\netstandard2.0\Nuclex.Avalonia.xml" target="lib/netstandard2.0" />
 
   </files>
 </package>
diff --git a/nuspecs/Nuclex.Mvvm.WinForms.Ninject.nuspec b/nuspecs/Nuclex.Mvvm.WinForms.Ninject.nuspec
index 32ac696..2733426 100644
--- a/nuspecs/Nuclex.Mvvm.WinForms.Ninject.nuspec
+++ b/nuspecs/Nuclex.Mvvm.WinForms.Ninject.nuspec
@@ -15,9 +15,13 @@
       Nuclex.Windows.Forms (in the Nuclex.Mvvm.WinForms NuGet package)
     </description>
     <language>en-US</language>
-    <tags>mvvm,util,ninject,dependency-injection</tags>
+    <tags>mvvm,util,winforms,ninject,dependency-injection</tags>
     <icon>nuclex-logo.png</icon>
-    <repository type="git" url="https://github.com/nuclex-shared-dotnet/Nuclex.Windows.Forms.Ninject.git" commit="66a7848d1f149160726fda055051dd7ca7afa312" />
+    <repository
+      type="git"
+      url="https://github.com/nuclex-shared-dotnet/Nuclex.Windows.Forms.Ninject.git"
+      commit="f3df56d6d5c3579e0eeb7d397df9f94ec021292b"
+    />
     <dependencies>
       <group targetFramework=".NETFramework4.6.2">
         <dependency id="Nuclex.Mvvm.WinForms" version="[1.3.0, 2.0.0)" exclude="Build,Analyzers" />
@@ -37,17 +41,17 @@
   </metadata>
   <files>
 
-    <file src="ReadMe.md" target="ReadMe.md" />
-    <file src="nuclex-logo.png" target="nuclex-logo.png" />
+    <file src="..\ReadMe.md" target="ReadMe.md" />
+    <file src="..\nuclex-logo.png" target="nuclex-logo.png" />
 
     <!-- Feature set for .NET Framework 4.6.2 (with Windows.Forms) -->
-    <file src="Nuclex.Windows.Forms.Ninject\bin\$Configuration$\net462\Nuclex.Windows.Forms.Ninject.dll" target="lib/net462" />
-    <file src="Nuclex.Windows.Forms.Ninject\bin\$Configuration$\net462\Nuclex.Windows.Forms.Ninject.xml" target="lib/net462" />
+    <file src="..\Nuclex.Windows.Forms.Ninject\bin\$Configuration$\net462\Nuclex.Windows.Forms.Ninject.dll" target="lib/net462" />
+    <file src="..\Nuclex.Windows.Forms.Ninject\bin\$Configuration$\net462\Nuclex.Windows.Forms.Ninject.xml" target="lib/net462" />
 
     <!-- Feature set for .NET 8.0 on Windows (with Windows.Forms) -->
     <!-- Btw, '-windows7.0' means Windows Seven, the one between Vista and 8, not the internal Windows release number -->
-    <file src="Nuclex.Windows.Forms.Ninject\bin\$Configuration$\net8.0-windows\Nuclex.Windows.Forms.Ninject.dll" target="lib/net8.0-windows7.0" />
-    <file src="Nuclex.Windows.Forms.Ninject\bin\$Configuration$\net8.0-windows\Nuclex.Windows.Forms.Ninject.xml" target="lib/net8.0-windows7.0" />
+    <file src="..\Nuclex.Windows.Forms.Ninject\bin\$Configuration$\net8.0-windows\Nuclex.Windows.Forms.Ninject.dll" target="lib/net8.0-windows7.0" />
+    <file src="..\Nuclex.Windows.Forms.Ninject\bin\$Configuration$\net8.0-windows\Nuclex.Windows.Forms.Ninject.xml" target="lib/net8.0-windows7.0" />
 
   </files>
 </package>
diff --git a/nuspecs/Nuclex.Mvvm.WinForms.nuspec b/nuspecs/Nuclex.Mvvm.WinForms.nuspec
index 86d53d6..7ac0652 100644
--- a/nuspecs/Nuclex.Mvvm.WinForms.nuspec
+++ b/nuspecs/Nuclex.Mvvm.WinForms.nuspec
@@ -16,12 +16,12 @@
       automatic view locator, page-switching main windows and various user controls
     </description>
     <language>en-US</language>
-    <tags>mvvm,util</tags>
+    <tags>mvvm,util,winforms</tags>
     <icon>nuclex-logo.png</icon>
     <repository
       type="git"
       url="https://github.com/nuclex-shared-dotnet/Nuclex.Windows.Forms.git"
-      commit="5fb433ad983e58725e0d25faa8968a75b3dfd178"
+      commit="35da89f1deb80795e0e88dbb84e1519d7d592189"
     />
     <dependencies>
       <group targetFramework=".NETFramework4.6.2">
@@ -40,17 +40,17 @@
   </metadata>
   <files>
 
-    <file src="ReadMe.md" target="ReadMe.md" />
-    <file src="nuclex-logo.png" target="nuclex-logo.png" />
+    <file src="..\ReadMe.md" target="ReadMe.md" />
+    <file src="..\nuclex-logo.png" target="nuclex-logo.png" />
 
     <!-- Feature set for .NET Framework 4.6.2 (with Windows.Forms) -->
-    <file src="Nuclex.Windows.Forms\bin\$Configuration$\net462\Nuclex.Windows.Forms.dll" target="lib/net462" />
-    <file src="Nuclex.Windows.Forms\bin\$Configuration$\net462\Nuclex.Windows.Forms.xml" target="lib/net462" />
+    <file src="..\Nuclex.Windows.Forms\bin\$Configuration$\net462\Nuclex.Windows.Forms.dll" target="lib/net462" />
+    <file src="..\Nuclex.Windows.Forms\bin\$Configuration$\net462\Nuclex.Windows.Forms.xml" target="lib/net462" />
 
     <!-- Feature set for .NET 8.0 on Windows (with Windows.Forms) -->
     <!-- Btw, '-windows7.0' means Windows Seven, the one between Vista and 8, not the internal Windows release number -->
-    <file src="Nuclex.Windows.Forms\bin\$Configuration$\net8.0-windows\Nuclex.Windows.Forms.dll" target="lib/net8.0-windows7.0" />
-    <file src="Nuclex.Windows.Forms\bin\$Configuration$\net8.0-windows\Nuclex.Windows.Forms.xml" target="lib/net8.0-windows7.0" />
+    <file src="..\Nuclex.Windows.Forms\bin\$Configuration$\net8.0-windows\Nuclex.Windows.Forms.dll" target="lib/net8.0-windows7.0" />
+    <file src="..\Nuclex.Windows.Forms\bin\$Configuration$\net8.0-windows\Nuclex.Windows.Forms.xml" target="lib/net8.0-windows7.0" />
 
   </files>
 </package>
diff --git a/nuspecs/Nuclex.Mvvm.Winforms.DependencyInjection.nuspec b/nuspecs/Nuclex.Mvvm.Winforms.DependencyInjection.nuspec
index c28c1b6..c81267c 100644
--- a/nuspecs/Nuclex.Mvvm.Winforms.DependencyInjection.nuspec
+++ b/nuspecs/Nuclex.Mvvm.Winforms.DependencyInjection.nuspec
@@ -16,12 +16,12 @@
       with Nuclex.Windows.Forms (in the Nuclex.Mvvm.WinForms package)
     </description>
     <language>en-US</language>
-    <tags>mvvm,util,ninject,dependency-injection</tags>
+    <tags>mvvm,util,winforms,dependency-injection</tags>
     <icon>nuclex-logo.png</icon>
     <repository
       type="git"
       url="https://github.com/nuclex-shared-dotnet/Nuclex.Windows.Forms.DependencyInjection.git"
-      commit="573b7ab93d25034a649bdf401f5439ec15c165f5"
+      commit="981b3ec9a072a206a2f1735e8afd7aca4f5f7f71"
     />
     <dependencies>
       <group targetFramework=".NETFramework4.6.2">
@@ -42,17 +42,17 @@
   </metadata>
   <files>
 
-    <file src="ReadMe.md" target="ReadMe.md" />
-    <file src="nuclex-logo.png" target="nuclex-logo.png" />
+    <file src="..\ReadMe.md" target="ReadMe.md" />
+    <file src="..\nuclex-logo.png" target="nuclex-logo.png" />
 
     <!-- Feature set for .NET Framework 4.6.2 (with Windows.Forms) -->
-    <file src="Nuclex.Windows.Forms.DependencyInjection\bin\$Configuration$\net462\Nuclex.Windows.Forms.DependencyInjection.dll" target="lib/net462" />
-    <file src="Nuclex.Windows.Forms.DependencyInjection\bin\$Configuration$\net462\Nuclex.Windows.Forms.DependencyInjection.xml" target="lib/net462" />
+    <file src="..\Nuclex.Windows.Forms.DependencyInjection\bin\$Configuration$\net462\Nuclex.Windows.Forms.DependencyInjection.dll" target="lib/net462" />
+    <file src="..\Nuclex.Windows.Forms.DependencyInjection\bin\$Configuration$\net462\Nuclex.Windows.Forms.DependencyInjection.xml" target="lib/net462" />
 
     <!-- Feature set for .NET 8.0 on Windows (with Windows.Forms) -->
     <!-- Btw, '-windows7.0' means Windows Seven, the one between Vista and 8, not the internal Windows release number -->
-    <file src="Nuclex.Windows.Forms.DependencyInjection\bin\$Configuration$\net8.0-windows\Nuclex.Windows.Forms.DependencyInjection.dll" target="lib/net8.0-windows7.0" />
-    <file src="Nuclex.Windows.Forms.DependencyInjection\bin\$Configuration$\net8.0-windows\Nuclex.Windows.Forms.DependencyInjection.xml" target="lib/net8.0-windows7.0" />
+    <file src="..\Nuclex.Windows.Forms.DependencyInjection\bin\$Configuration$\net8.0-windows\Nuclex.Windows.Forms.DependencyInjection.dll" target="lib/net8.0-windows7.0" />
+    <file src="..\Nuclex.Windows.Forms.DependencyInjection\bin\$Configuration$\net8.0-windows\Nuclex.Windows.Forms.DependencyInjection.xml" target="lib/net8.0-windows7.0" />
 
   </files>
 </package>