diff --git a/build/build-for-myget.nuspec b/build/build-for-myget.nuspec
index ba896ab4..6f0627e0 100644
--- a/build/build-for-myget.nuspec
+++ b/build/build-for-myget.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>HandyControl</id>
-    <version>3.1.0.105402</version>
+    <version>3.1.0</version>
     <title>HandyOrg</title>
     <authors>HandyOrg</authors>
     <owners>HandyOrg</owners>
diff --git a/build/build.nuspec b/build/build.nuspec
index a2ca3d6d..6c255e8d 100644
--- a/build/build.nuspec
+++ b/build/build.nuspec
@@ -10,7 +10,7 @@
     <license type="file">LICENSE</license>
     <icon>icon.png</icon>
     <projectUrl>https://github.com/NaBian/HandyControl</projectUrl>
-    <description>Contains some commonly used simple WPF controls</description>
+    <description>Contains some simple and commonly used WPF controls</description>
     <releaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</releaseNotes>
     <copyright>Copyright © HandyOrg 2018-2021</copyright>
     <tags>WPF C# Control</tags>
diff --git a/src/Directory.Build.Props b/src/Directory.Build.Props
index 18714da4..cb27ef60 100644
--- a/src/Directory.Build.Props
+++ b/src/Directory.Build.Props
@@ -1,11 +1,13 @@
 <Project>
     <PropertyGroup>
         <UseWPF>true</UseWPF>
-        <Version>3.0.0.0</Version>
-        <FileVersion>3.0.0.0</FileVersion>
-        <AssemblyVersion>3.0.0.0</AssemblyVersion>
-        <LangVersion>8.0</LangVersion>
-        <Copyright>Copyright © HandyOrg 2018-2020</Copyright>
+        <Version>3.1.0.0</Version>
+        <FileVersion>3.1.0.0</FileVersion>
+        <AssemblyVersion>3.1.0.0</AssemblyVersion>
+        <LangVersion>latest</LangVersion>
+        <Copyright>Copyright © HandyOrg 2018-2021</Copyright>
         <Authors>HandyOrg</Authors>
+        <RepositoryUrl>https://github.com/HandyOrg/HandyControl</RepositoryUrl>
+        <PackageProjectUrl>https://handyorg.github.io/</PackageProjectUrl>
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
index dc9e03d7..bcbd56df 100644
--- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
+++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
@@ -6,7 +6,6 @@
     <TargetFramework>net40</TargetFramework>
     <ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
     <NoWarn>0108;MSB3026;MSB3061</NoWarn>
-    <UseWPF>true</UseWPF>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
index 5d2db9ee..7b163473 100644
--- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
+++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
@@ -3,18 +3,15 @@
     <AssemblyName>HandyControl</AssemblyName>
     <RootNamespace>HandyControl</RootNamespace>
     <TargetFramework>net40</TargetFramework>
-    <Description>Contains some commonly used simple WPF controls</Description>
+    <Description>Contains some simple and commonly used WPF controls</Description>
     <PackageId>HandyControl</PackageId>
-    <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <NoWarn>0067;0649;1591;0108;1717</NoWarn>
-    <UseWPF>true</UseWPF>
     <AssemblyOriginatorKeyFile>..\..\Shared\HandyControl_Shared\key.snk</AssemblyOriginatorKeyFile>
-    <Copyright>Copyright © HandyOrg 2018-2021</Copyright>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
-    <Version>3.1.0.0</Version>
-    <RepositoryUrl>https://github.com/HandyOrg/HandyControl</RepositoryUrl>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PackageTags>WPF C# Control</PackageTags>
+    <PackageReleaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</PackageReleaseNotes>
+    <RepositoryType>git</RepositoryType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-Net40|AnyCPU' ">
     <SignAssembly>true</SignAssembly>
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
index e4c5a8ed..6166da8a 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
@@ -7,12 +7,6 @@
     <ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
     <NoWarn>0108;MSB3026;MSB3061</NoWarn>
     <MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
-    <UseWPF>true</UseWPF>
-    <Copyright>Copyright © HandyOrg 2018-2021</Copyright>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
-    <Version>3.1.0.0</Version>
-    <RepositoryUrl>https://github.com/HandyOrg/HandyControl</RepositoryUrl>
     <ApplicationManifest>..\..\Shared\HandyControlDemo_Shared\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
index 195f24e6..9926b810 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
@@ -3,19 +3,16 @@
     <AssemblyName>HandyControl</AssemblyName>
     <RootNamespace>HandyControl</RootNamespace>
     <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net5.0-windows</TargetFrameworks>
-    <Description>Contains some commonly used simple WPF controls</Description>
+    <Description>Contains some simple and commonly used WPF controls</Description>
     <PackageId>HandyControl</PackageId>
-    <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <NoWarn>0067;0649;1591;MSB3061;SYSLIB0003;SYSLIB0004</NoWarn>
     <MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
-    <UseWPF>true</UseWPF>
     <AssemblyOriginatorKeyFile>..\..\Shared\HandyControl_Shared\key.snk</AssemblyOriginatorKeyFile>
-    <Copyright>Copyright © HandyOrg 2018-2021</Copyright>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
-    <Version>3.1.0.0</Version>
-    <RepositoryUrl>https://github.com/HandyOrg/HandyControl</RepositoryUrl>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PackageTags>WPF C# Control</PackageTags>
+    <PackageReleaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</PackageReleaseNotes>
+    <RepositoryType>git</RepositoryType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <SignAssembly>true</SignAssembly>
diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
index 92a65e77..c116cdcd 100644
--- a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
+++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
@@ -6,11 +6,6 @@
     <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net5.0-windows</TargetFrameworks>
     <NoWarn>MSB3026;MSB3061</NoWarn>
     <MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
-    <Version>3.1.0.0</Version>
-    <Copyright>Copyright © HandyOrg 2018-2021</Copyright>
-    <RepositoryUrl>https://github.com/HandyOrg/HandyControl</RepositoryUrl>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Window\AboutWindow.xaml">