diff --git a/Bin/net40demo/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe
similarity index 100%
rename from Bin/net40demo/SunnyUI.Demo.exe
rename to Bin/net40/SunnyUI.Demo.exe
diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll
index bb9ccde8..fbdb9a4a 100644
Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ
diff --git a/Bin/net40demo/SunnyUI.Common.dll b/Bin/net40demo/SunnyUI.Common.dll
deleted file mode 100644
index c2fe506d..00000000
Binary files a/Bin/net40demo/SunnyUI.Common.dll and /dev/null differ
diff --git a/Bin/net40demo/SunnyUI.dll b/Bin/net40demo/SunnyUI.dll
deleted file mode 100644
index db32e39b..00000000
Binary files a/Bin/net40demo/SunnyUI.dll and /dev/null differ
diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll
index 53cb9383..6f175c66 100644
Binary files a/Bin/net5.0-windows/SunnyUI.dll and b/Bin/net5.0-windows/SunnyUI.dll differ
diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll
index cec8e1ed..134b92b3 100644
Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ
diff --git a/SunnyUI.Demo/SunnyUI.Demo.csproj b/SunnyUI.Demo/SunnyUI.Demo.csproj
index b97c4c14..0627fc89 100644
--- a/SunnyUI.Demo/SunnyUI.Demo.csproj
+++ b/SunnyUI.Demo/SunnyUI.Demo.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Bin\net40demo\</OutputPath>
+    <OutputPath>..\Bin\net40\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Bin\net40demo\</OutputPath>
+    <OutputPath>..\Bin\net40\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -36,10 +36,12 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="SunnyUI, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SunnyUI.3.0.0\lib\net40\SunnyUI.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Bin\net40\SunnyUI.dll</HintPath>
     </Reference>
     <Reference Include="SunnyUI.Common, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SunnyUI.Common.3.0.0\lib\net40\SunnyUI.Common.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Bin\net40\SunnyUI.Common.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -457,7 +459,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SunnyUI.Demo/packages.config b/SunnyUI.Demo/packages.config
deleted file mode 100644
index 1f205d4f..00000000
--- a/SunnyUI.Demo/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="SunnyUI" version="3.0.0" targetFramework="net40" />
-  <package id="SunnyUI.Common" version="3.0.0" targetFramework="net40" />
-</packages>
\ No newline at end of file
diff --git a/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj b/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj
index 6cb8d662..688742b4 100644
--- a/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj
+++ b/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj
@@ -16,11 +16,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\Bin\net5.0-demo</OutputPath>
+    <OutputPath>bin\</OutputPath>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\Bin\net5.0-demo</OutputPath>
+    <OutputPath>bin\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Bin/net5.0-demo/net5.0-windows/SunnyUI.Common.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Common.dll
similarity index 100%
rename from Bin/net5.0-demo/net5.0-windows/SunnyUI.Common.dll
rename to SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Common.dll
diff --git a/Bin/net5.0-demo/net5.0-windows/SunnyUI.Net5.Demo.deps.json b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.deps.json
similarity index 100%
rename from Bin/net5.0-demo/net5.0-windows/SunnyUI.Net5.Demo.deps.json
rename to SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.deps.json
diff --git a/Bin/net5.0-demo/net5.0-windows/SunnyUI.Net5.Demo.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll
similarity index 100%
rename from Bin/net5.0-demo/net5.0-windows/SunnyUI.Net5.Demo.dll
rename to SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll
diff --git a/Bin/net5.0-demo/net5.0-windows/SunnyUI.Net5.Demo.exe b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.exe
similarity index 100%
rename from Bin/net5.0-demo/net5.0-windows/SunnyUI.Net5.Demo.exe
rename to SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.exe
diff --git a/Bin/net5.0-demo/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json
similarity index 100%
rename from Bin/net5.0-demo/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json
rename to SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json
diff --git a/Bin/net5.0-demo/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.json b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.json
similarity index 100%
rename from Bin/net5.0-demo/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.json
rename to SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.json
diff --git a/Bin/net5.0-demo/net5.0-windows/SunnyUI.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.dll
similarity index 100%
rename from Bin/net5.0-demo/net5.0-windows/SunnyUI.dll
rename to SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.dll
diff --git a/Bin/net5.0-demo/net5.0-windows/ref/SunnyUI.Net5.Demo.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll
similarity index 100%
rename from Bin/net5.0-demo/net5.0-windows/ref/SunnyUI.Net5.Demo.dll
rename to SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll
diff --git a/SunnyUI.sln b/SunnyUI.sln
index 87e75e3c..acaf677d 100644
--- a/SunnyUI.sln
+++ b/SunnyUI.sln
@@ -6,6 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SunnyUI", "SunnyUI\SunnyUI.csproj", "{AB1CB247-E20B-4CBE-B269-570ADDD96C53}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SunnyUI.Demo", "SunnyUI.Demo\SunnyUI.Demo.csproj", "{6AE19B87-C2AA-4C56-BC26-1C343F30FF58}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AB1CB247-E20B-4CBE-B269-570ADDD96C53} = {AB1CB247-E20B-4CBE-B269-570ADDD96C53}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SunnyUI.Net5.Demo", "SunnyUI.Net5.Demo\SunnyUI.Net5.Demo.csproj", "{CD5517A6-D0A1-4758-9D18-B4189C5157F5}"
 EndProject
diff --git a/SunnyUI/SunnyUI.csproj b/SunnyUI/SunnyUI.csproj
index fa93509b..706fd982 100644
--- a/SunnyUI/SunnyUI.csproj
+++ b/SunnyUI/SunnyUI.csproj
@@ -21,6 +21,8 @@
  
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 		<OutputPath>..\Bin\</OutputPath>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<DocumentationFile></DocumentationFile>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">