diff --git a/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj b/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj
index fe7b5c5f..f7b09bc9 100644
--- a/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj
+++ b/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj
@@ -10,10 +10,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>LibreMetaverse.GUI</AssemblyName>
+	<PackageId>LibreMetaverse.GUI</PackageId>
+	<Description>GUI library for LibreMetaverse</Description>
 	<UseWindowsForms>true</UseWindowsForms>
     <OutputType>Library</OutputType>
     <RootNamespace>LibreMetaverse.GUI</RootNamespace>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	<NoWarn>1591</NoWarn>
     <Platforms>AnyCPU;x64;x86</Platforms>
 	<OutputPath>..\bin\</OutputPath>
   </PropertyGroup>
diff --git a/LibreMetaverse.GUI/LibreMetaverse.GUI.nuspec b/LibreMetaverse.GUI/LibreMetaverse.GUI.nuspec
index 9de46f90..107b2bd8 100644
--- a/LibreMetaverse.GUI/LibreMetaverse.GUI.nuspec
+++ b/LibreMetaverse.GUI/LibreMetaverse.GUI.nuspec
@@ -1,15 +1,21 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>LibreMetaverse.GUI</id>
+    <id>$id$</id>
     <version>$version$</version>
-    <authors>Cinder Biscuits</authors>
-    <owners>Cinder Biscuits</owners>
-    <licenseUrl>https://github.com/cinderblocks/libremetaverse/blob/master/LICENSE.txt</licenseUrl>
+    <authors>$author$</authors>
+	<license type="expression">BSD-3-Clause-Clear</license>
+	<icon>..\data\logo.png</icon>
+	<readme>..\docs\README.md</readme>
     <projectUrl>https://github.com/cinderblocks/libremetaverse</projectUrl>
+	<repository type="git" url="https://github.com/cinderblocks/libremetaverse.git" branch="master" />
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>GUI library for LibreMetaverse</description>
-    <copyright>Copyright 2017</copyright>
-    <tags>LMV OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld Radegast SecondLife</tags>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+    <tags>LMV OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld VirtualReality 3D Radegast MEGAbolt SecondLife</tags>
   </metadata>
+  <files>
+    <file src="..\data\logo.png" target="images\" />
+    <file src="..\README.md" target="docs\" />
+  </files>
 </package>
\ No newline at end of file
diff --git a/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj b/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj
index 2270af95..0515ba94 100644
--- a/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj
+++ b/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj
@@ -1,10 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>LibreMetaverse.Rendering.Meshmerizer</AssemblyName>
+	<PackageId>LibreMetaverse.Rendering.Meshmerizer</PackageId>
+	<Description>Meshmerizer library for rendering mesh assets in LibreMetaverse</Description>
+	<RootNamespace>LibreMetaverse.Rendering.Meshmerizer</RootNamespace>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
     <OutputType>Library</OutputType>
-    <RootNamespace>LibreMetaverse.Rendering.Meshmerizer</RootNamespace>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	<NoWarn>1591</NoWarn>
     <Platforms>AnyCPU;x64;x86</Platforms>
 	<OutputPath>..\bin\</OutputPath>
   </PropertyGroup>
diff --git a/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.nuspec b/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.nuspec
index 889728c5..78a2e757 100644
--- a/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.nuspec
+++ b/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.nuspec
@@ -1,15 +1,21 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>LibreMetaverse.Rendering.Meshmerizer</id>
+    <id>$id$</id>
     <version>$version$</version>
-    <authors>Cinder Biscuits</authors>
-    <owners>Cinder Biscuits</owners>
-    <licenseUrl>https://github.com/cinderblocks/libremetaverse/blob/master/LICENSE.txt</licenseUrl>
+    <authors>$author$</authors>
+    <license type="expression">BSD-3-Clause-Clear</license>
+	<icon>..\data\logo.png</icon>
+	<readme>..\docs\README.md</readme>
     <projectUrl>https://github.com/cinderblocks/libremetaverse</projectUrl>
+	<repository type="git" url="https://github.com/cinderblocks/libremetaverse.git" branch="master" />
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Meshmerizer library for rendering mesh assets in LibreMetaverse</description>
-    <copyright>Copyright 2017</copyright>
-    <tags>LMV OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld Radegast SecondLife</tags>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+    <tags>LMV OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld VirtualReality 3D Radegast MEGAbolt SecondLife</tags>
   </metadata>
+  <files>
+    <file src="..\data\logo.png" target="images\" />
+    <file src="..\README.md" target="docs\" />
+  </files>
 </package>
\ No newline at end of file
diff --git a/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj b/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj
index 90e6f5ea..b4f92dda 100644
--- a/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj
+++ b/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj
@@ -1,10 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>LibreMetaverse.Rendering.Simple</AssemblyName>
+	<Description>Simple library for rendering mesh assets in LibreMetaverse</Description>
+	<PackageId>LibreMetaverse.Rendering.Simple</PackageId>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>LibreMetaverse.Rendering.Simple</RootNamespace>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	<NoWarn>1591</NoWarn>
     <Platforms>AnyCPU;x64;x86</Platforms>
 	<OutputPath>..\bin\</OutputPath>
   </PropertyGroup>
diff --git a/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.nuspec b/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.nuspec
index f1ce0717..92a0b119 100644
--- a/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.nuspec
+++ b/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.nuspec
@@ -1,15 +1,21 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>LibreMetaverse.Rendering.Simple</id>
+    <id>$id$</id>
     <version>$version$</version>
-    <authors>Cinder Biscuits</authors>
-    <owners>Cinder Biscuits</owners>
-    <licenseUrl>https://github.com/cinderblocks/libremetaverse/blob/master/LICENSE.txt</licenseUrl>
+    <authors>$author$</authors>
+    <license type="expression">BSD-3-Clause-Clear</license>
+	<icon>..\data\logo.png</icon>
+	<readme>..\docs\README.md</readme>
     <projectUrl>https://github.com/cinderblocks/libremetaverse</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Simple library for rendering mesh assets in LibreMetaverse</description>
-    <copyright>Copyright 2017</copyright>
-    <tags>LMV OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld Radegast SecondLife</tags>
+	<repository type="git" url="https://github.com/cinderblocks/libremetaverse.git" branch="master" />
+	<requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+    <tags>LMV OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld VirtualReality 3D Radegast MEGAbolt SecondLife</tags>
   </metadata>
+  <files>
+    <file src="..\data\logo.png" target="images\" />
+    <file src="..\README.md" target="docs\" />
+  </files>
 </package>
\ No newline at end of file
diff --git a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj
index dacbf26d..28cf00d7 100644
--- a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj
+++ b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj
@@ -1,10 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>LibreMetaverse.StructuredData</AssemblyName>
+	<Description>LibreMetaverse structured data library</Description>
+	<PackageId>LibreMetaverse.StructuredData</PackageId>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>LibreMetaverse.StructuredData</RootNamespace>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	<NoWarn>1591</NoWarn>
     <Platforms>AnyCPU;x64;x86</Platforms>
 	<OutputPath>..\bin\</OutputPath>
   </PropertyGroup>
diff --git a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.nuspec b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.nuspec
index aac0f8bc..f3ac07a4 100644
--- a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.nuspec
+++ b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.nuspec
@@ -1,15 +1,21 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>LibreMetaverse.StructuredData</id>
+    <id>$id$</id>
     <version>$version$</version>
-    <authors>Cinder Biscuits</authors>
-    <owners>Cinder Biscuits</owners>
-    <licenseUrl>https://github.com/cinderblocks/libremetaverse/blob/master/LICENSE.txt</licenseUrl>
+    <authors>$author$</authors>
+    <license type="expression">BSD-3-Clause-Clear</license>
+    <icon>..\data\logo.png</icon>
+	<readme>..\docs\README.md</readme>
     <projectUrl>https://github.com/cinderblocks/libremetaverse</projectUrl>
+    <repository type="git" url="https://github.com/cinderblocks/libremetaverse.git" branch="master" />
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>LibreMetaverse structured data library</description>
-    <copyright>Copyright 2017</copyright>
-    <tags>LMV OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld Radegast SecondLife</tags>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+    <tags>LMV OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld VirtualReality 3D Radegast MEGAbolt SecondLife</tags>
   </metadata>
+  <files>
+    <file src="..\data\logo.png" target="images\" />
+    <file src="..\README.md" target="docs\" />
+  </files>
 </package>
\ No newline at end of file
diff --git a/LibreMetaverse.Types/LibreMetaverse.Types.csproj b/LibreMetaverse.Types/LibreMetaverse.Types.csproj
index ee3fec4e..2b0e648c 100644
--- a/LibreMetaverse.Types/LibreMetaverse.Types.csproj
+++ b/LibreMetaverse.Types/LibreMetaverse.Types.csproj
@@ -1,10 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>LibreMetaverse.Types</AssemblyName>
+	<PackageId>LibreMetaverse.Types</PackageId>
+	<Description>LibreMetaverse type library</Description>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>LibreMetaverse</RootNamespace>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	<NoWarn>1591</NoWarn>
     <Platforms>AnyCPU;x64;x86</Platforms>
 	<OutputPath>..\bin\</OutputPath>
   </PropertyGroup>
diff --git a/LibreMetaverse.Types/LibreMetaverse.Types.nuspec b/LibreMetaverse.Types/LibreMetaverse.Types.nuspec
index 2d87b09c..92a0b119 100644
--- a/LibreMetaverse.Types/LibreMetaverse.Types.nuspec
+++ b/LibreMetaverse.Types/LibreMetaverse.Types.nuspec
@@ -1,15 +1,21 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>LibreMetaverse.Types</id>
+    <id>$id$</id>
     <version>$version$</version>
-    <authors>Cinder Biscuits</authors>
-    <owners>Cinder Biscuits</owners>
-    <licenseUrl>https://github.com/cinderblocks/libremetaverse/blob/master/LICENSE.txt</licenseUrl>
+    <authors>$author$</authors>
+    <license type="expression">BSD-3-Clause-Clear</license>
+	<icon>..\data\logo.png</icon>
+	<readme>..\docs\README.md</readme>
     <projectUrl>https://github.com/cinderblocks/libremetaverse</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>LibreMetaverse type library</description>
-    <copyright>Copyright 2017</copyright>
-    <tags>LMV OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld Radegast SecondLife</tags>
+	<repository type="git" url="https://github.com/cinderblocks/libremetaverse.git" branch="master" />
+	<requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+    <tags>LMV OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld VirtualReality 3D Radegast MEGAbolt SecondLife</tags>
   </metadata>
+  <files>
+    <file src="..\data\logo.png" target="images\" />
+    <file src="..\README.md" target="docs\" />
+  </files>
 </package>
\ No newline at end of file
diff --git a/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj b/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj
index af99aad2..ef321cea 100644
--- a/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj
+++ b/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj
@@ -1,10 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 	  <AssemblyName>LibreMetaverse.Utilities</AssemblyName>
+      <PackageId>LibreMetaverse.Utilities</PackageId>
+	  <Description>LibreMetaverse utility library</Description>
 	  <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
 	  <OutputType>Library</OutputType>
 	  <RootNamespace>LibreMetaverse.Utilities</RootNamespace>
 	  <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+      <NoWarn>1591</NoWarn>
 	  <Platforms>AnyCPU;x64;x86</Platforms>
       <OutputPath>..\bin\</OutputPath>
 	</PropertyGroup>
diff --git a/LibreMetaverse.Utilities/LibreMetaverse.Utilities.nuspec b/LibreMetaverse.Utilities/LibreMetaverse.Utilities.nuspec
index d86601b2..6fe6845f 100644
--- a/LibreMetaverse.Utilities/LibreMetaverse.Utilities.nuspec
+++ b/LibreMetaverse.Utilities/LibreMetaverse.Utilities.nuspec
@@ -1,15 +1,21 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>LibreMetaverse.Utilities</id>
+    <id>$id$</id>
     <version>$version$</version>
-    <authors>Cinder Biscuits</authors>
-    <owners>Cinder Biscuits</owners>
-    <licenseUrl>https://github.com/cinderblocks/libremetaverse/blob/master/LICENSE.txt</licenseUrl>
+    <authors>$author$</authors>
+    <license type="expression">BSD-3-Clause-Clear</license>
+	<icon>..\images\logo.png</icon>
+	<readme>..\docs\README.md</readme>
     <projectUrl>https://github.com/cinderblocks/libremetaverse</projectUrl>
+	<repository type="git" url="https://github.com/cinderblocks/libremetaverse.git" branch="master" />
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>LibreMetaverse utility library</description>
-    <copyright>Copyright 2017</copyright>
-    <tags>LMV OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld Radegast SecondLife</tags>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+    <tags>LMV OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld VirtualReality 3D Radegast MEGAbolt SecondLife</tags>
   </metadata>
+  <files>
+    <file src="..\data\logo.png" target="images\" />
+    <file src="..\README.md" target="docs\" />
+  </files>
 </package>
\ No newline at end of file
diff --git a/LibreMetaverse/LibreMetaverse.csproj b/LibreMetaverse/LibreMetaverse.csproj
index 2351e181..7ce52fa3 100644
--- a/LibreMetaverse/LibreMetaverse.csproj
+++ b/LibreMetaverse/LibreMetaverse.csproj
@@ -1,11 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>LibreMetaverse</AssemblyName>
+	<PackageId>LibreMetaverse</PackageId>
+	<Description>LibreMetaverse allows your code to read and work with data send across a SecondLife, Halcyon, OpenSimulator, or related connection.</Description>
     <OutputType>Library</OutputType>
     <RootNamespace>LibreMetaverse</RootNamespace>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 	<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
 	<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	<NoWarn>1591</NoWarn>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
 	<OutputPath>..\bin\</OutputPath>
diff --git a/LibreMetaverse/LibreMetaverse.nuspec b/LibreMetaverse/LibreMetaverse.nuspec
index d4a49034..d017dcda 100644
--- a/LibreMetaverse/LibreMetaverse.nuspec
+++ b/LibreMetaverse/LibreMetaverse.nuspec
@@ -1,15 +1,21 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>LibreMetaverse</id>
+    <id>$id$</id>
     <version>$version$</version>
-    <authors>Cinder Biscuits</authors>
-    <owners>Cinder Biscuits</owners>
-    <licenseUrl>https://github.com/cinderblocks/libremetaverse/blob/master/LICENSE.txt</licenseUrl>
+    <authors>$author$</authors>
+    <license type="expression">BSD-3-Clause-Clear</license>
+	<icon>..\data\logo.png</icon>
+	<readme>..\docs\README.md</readme>
     <projectUrl>https://github.com/cinderblocks/libremetaverse</projectUrl>
+	<repository type="git" url="https://github.com/cinderblocks/libremetaverse.git" branch="master" />
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>LibreMetaverse allows your code to read and work with data send across a SecondLife, Halcyon, OpenSimulator, or related connection.</description>
-    <copyright>Copyright 2017</copyright>
-    <tags>LMV OMV OpenMetaverse OpenSim OpenSimulator Halcyon OpenMetaverseFoundation VirtualWorld Radegast SecondLife</tags>
+	<description>$description$</description>
+    <copyright>$copyright$</copyright>
+    <tags>LMV OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld VirtualReality 3D Radegast MEGAbolt SecondLife</tags>
   </metadata>
+  <files>
+    <file src="..\data\logo.png" target="images\" />
+    <file src="..\README.md" target="docs\" />
+  </files>
 </package>
\ No newline at end of file
diff --git a/PrimMesher/LibreMetaverse.PrimMesher.csproj b/PrimMesher/LibreMetaverse.PrimMesher.csproj
index 14ad7215..48309d02 100644
--- a/PrimMesher/LibreMetaverse.PrimMesher.csproj
+++ b/PrimMesher/LibreMetaverse.PrimMesher.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <RootNamespace>LibreMetaverse.PrimMesher</RootNamespace>
+	<RootNamespace>LibreMetaverse.PrimMesher</RootNamespace>
     <AssemblyName>LibreMetaverse.PrimMesher</AssemblyName>
+	<PackageId>LibreMetaverse.PrimMesher</PackageId>
+	<OutputType>Library</OutputType>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
     <Authors>Dhalia Trimble, Sjofn LLC, OpenMetaverse Developers</Authors>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Product>LibreMetaverse.PrimMesher</Product>
-    <PackageId>LibreMetaverse.PrimMesher</PackageId>
-    <Platforms>AnyCPU;x64;x86</Platforms>
+	<NoWarn>1591</NoWarn>
+	<Platforms>AnyCPU;x64;x86</Platforms>
 	<OutputPath>..\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Programs/Baker/Baker.csproj b/Programs/Baker/Baker.csproj
index 54c09efa..97336014 100644
--- a/Programs/Baker/Baker.csproj
+++ b/Programs/Baker/Baker.csproj
@@ -9,6 +9,8 @@
 	<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
+	<PackageId>LibreMetaverse.Baker</PackageId>
+	<AssemblyName>Baker</AssemblyName>
 	<UseWindowsForms>true</UseWindowsForms>
 	<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 	<OutputType>WinExe</OutputType>
diff --git a/Programs/GridProxy/GridProxy.csproj b/Programs/GridProxy/GridProxy.csproj
index fea4ff88..39c6db89 100644
--- a/Programs/GridProxy/GridProxy.csproj
+++ b/Programs/GridProxy/GridProxy.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>GridProxy</AssemblyName>
+	<PackageId>LibreMetaverse.GridProxy</PackageId>
 	<OutputType>Library</OutputType>
     <RootNamespace>GridProxy</RootNamespace>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
diff --git a/Programs/examples/GridAccountant/GridAccountant.csproj b/Programs/examples/GridAccountant/GridAccountant.csproj
index 2ebfae5b..0f67fe41 100644
--- a/Programs/examples/GridAccountant/GridAccountant.csproj
+++ b/Programs/examples/GridAccountant/GridAccountant.csproj
@@ -9,6 +9,7 @@
 	<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
+	<PackageId>LibreMetaverse.GridAccountant</PackageId>
 	<AssemblyName>GridAccountant</AssemblyName>
 	<UseWindowsForms>true</UseWindowsForms>
 	<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
diff --git a/Programs/examples/IRCGateway/IRCGateway.csproj b/Programs/examples/IRCGateway/IRCGateway.csproj
index 5b1c4a51..5d183386 100644
--- a/Programs/examples/IRCGateway/IRCGateway.csproj
+++ b/Programs/examples/IRCGateway/IRCGateway.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
 	<AssemblyName>IrcGateway</AssemblyName>
+	<PackageId>LibreMetaverse.IrcGateway</PackageId>
 	<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <OutputType>Exe</OutputType>
     <OutputPath>..\..\..\bin\</OutputPath>
diff --git a/Programs/examples/PacketDump/PacketDump.csproj b/Programs/examples/PacketDump/PacketDump.csproj
index 24e56008..dcb28fbf 100644
--- a/Programs/examples/PacketDump/PacketDump.csproj
+++ b/Programs/examples/PacketDump/PacketDump.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>PacketDump</AssemblyName>
+	<PackageId>LibreMetaverse.PacketDump</PackageId>
 	<OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <OutputPath>..\..\..\bin\</OutputPath>
diff --git a/Programs/mapgenerator/mapgenerator.csproj b/Programs/mapgenerator/mapgenerator.csproj
index 572b8d9c..22343a5a 100644
--- a/Programs/mapgenerator/mapgenerator.csproj
+++ b/Programs/mapgenerator/mapgenerator.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
-    <OutputType>Exe</OutputType>
 	<AssemblyName>MapGenerator</AssemblyName>
-    <Platforms>AnyCPU;x64;x86</Platforms>
+	<PackageId>LibreMetaverse.MapGenerator</PackageId>
+	<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+	<OutputType>Exe</OutputType>
+	<Platforms>AnyCPU;x64;x86</Platforms>
 	<OutputPath>..\..\bin\</OutputPath>
   </PropertyGroup>
 	<ItemGroup>
diff --git a/data/logo.png b/data/logo.png
new file mode 100644
index 00000000..b58deb29
Binary files /dev/null and b/data/logo.png differ