diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Core30.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Core30.csproj
deleted file mode 100644
index 5d57b214..00000000
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Core30.csproj
+++ /dev/null
@@ -1,306 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <UseWPF>true</UseWPF>
-    <AssemblyName>HandyControlDemo</AssemblyName>
-    <RootNamespace>HandyControlDemo</RootNamespace>
-    <Version>1.5.4</Version>
-    <ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;Core</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="CommonServiceLocator" Version="2.0.2" />
-    <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Properties\AssemblyInfo.cs" />
-    <Compile Remove="Properties\Langs\Lang.en.Designer.cs" />
-    <Compile Remove="Tools\Helper\CommonHelper.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\HandyControl_Net_GE45\HandyControl_Core_30.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\1.jpg">
-      <Link>Resources\Img\1.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\2.jpg">
-      <Link>Resources\Img\2.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\3.jpg">
-      <Link>Resources\Img\3.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\4.jpg">
-      <Link>Resources\Img\4.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\5.jpg">
-      <Link>Resources\Img\5.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Album\1.jpg">
-      <Link>Resources\Img\Album\1.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Album\10.jpg">
-      <Link>Resources\Img\Album\10.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Album\2.jpg">
-      <Link>Resources\Img\Album\2.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Album\3.jpg">
-      <Link>Resources\Img\Album\3.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Album\4.jpg">
-      <Link>Resources\Img\Album\4.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Album\5.jpg">
-      <Link>Resources\Img\Album\5.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Album\6.jpg">
-      <Link>Resources\Img\Album\6.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Album\7.jpg">
-      <Link>Resources\Img\Album\7.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Album\8.jpg">
-      <Link>Resources\Img\Album\8.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Album\9.jpg">
-      <Link>Resources\Img\Album\9.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Avatar\avatar1.png">
-      <Link>Resources\Img\Avatar\avatar1.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Avatar\avatar2.png">
-      <Link>Resources\Img\Avatar\avatar2.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Avatar\avatar3.png">
-      <Link>Resources\Img\Avatar\avatar3.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Avatar\avatar4.png">
-      <Link>Resources\Img\Avatar\avatar4.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Avatar\avatar5.png">
-      <Link>Resources\Img\Avatar\avatar5.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Avatar\avatar6.png">
-      <Link>Resources\Img\Avatar\avatar6.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\b1.jpg">
-      <Link>Resources\Img\b1.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\b2.jpg">
-      <Link>Resources\Img\b2.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\car_chase.gif">
-      <Link>Resources\Img\car_chase.gif</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Chat\chat_back1.jpg">
-      <Link>Resources\Img\Chat\chat_back1.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Chat\chat_back2.jpg">
-      <Link>Resources\Img\Chat\chat_back2.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Flag\cn.png">
-      <Link>Resources\Img\Flag\cn.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Flag\en.png">
-      <Link>Resources\Img\Flag\en.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon-white.ico">
-      <Link>Resources\Img\icon-white.ico</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico">
-      <Link>Resources\Img\icon.ico</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Animation_16x.png">
-      <Link>Resources\Img\LeftMainContent\Animation_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\BorderElement_16x.png">
-      <Link>Resources\Img\LeftMainContent\BorderElement_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Brush_16x.png">
-      <Link>Resources\Img\LeftMainContent\Brush_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Bubble_16xLG.png">
-      <Link>Resources\Img\LeftMainContent\Bubble_16xLG.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\ButtonClick_16x.png">
-      <Link>Resources\Img\LeftMainContent\ButtonClick_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Calendar_16x.png">
-      <Link>Resources\Img\LeftMainContent\Calendar_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Carousel_16x.png">
-      <Link>Resources\Img\LeftMainContent\Carousel_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\CheckBox_16x.png">
-      <Link>Resources\Img\LeftMainContent\CheckBox_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\ColorPalette_16x.png">
-      <Link>Resources\Img\LeftMainContent\ColorPalette_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\ColorWheel_16x.png">
-      <Link>Resources\Img\LeftMainContent\ColorWheel_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\ComboBox_16x.png">
-      <Link>Resources\Img\LeftMainContent\ComboBox_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\ContextMenu_16x.png">
-      <Link>Resources\Img\LeftMainContent\ContextMenu_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\DataGrid_16x.png">
-      <Link>Resources\Img\LeftMainContent\DataGrid_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\DatePicker_16x.png">
-      <Link>Resources\Img\LeftMainContent\DatePicker_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\DetailDataView_16x.png">
-      <Link>Resources\Img\LeftMainContent\DetailDataView_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Dialog_16x.png">
-      <Link>Resources\Img\LeftMainContent\Dialog_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\DotLarge_16x.png">
-      <Link>Resources\Img\LeftMainContent\DotLarge_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Expander_16x.png">
-      <Link>Resources\Img\LeftMainContent\Expander_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\FlipVertical_16x.png">
-      <Link>Resources\Img\LeftMainContent\FlipVertical_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Flow_16x.png">
-      <Link>Resources\Img\LeftMainContent\Flow_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\GoToTop_16x.png">
-      <Link>Resources\Img\LeftMainContent\GoToTop_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\GroupBox_16x.png">
-      <Link>Resources\Img\LeftMainContent\GroupBox_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\HoverMenu_16x.png">
-      <Link>Resources\Img\LeftMainContent\HoverMenu_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\ImageBrowser_16x.png">
-      <Link>Resources\Img\LeftMainContent\ImageBrowser_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Label_16x.png">
-      <Link>Resources\Img\LeftMainContent\Label_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\LinearCarousel_16x.png">
-      <Link>Resources\Img\LeftMainContent\LinearCarousel_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\ListBox_16x.png">
-      <Link>Resources\Img\LeftMainContent\ListBox_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\ListView_16x.png">
-      <Link>Resources\Img\LeftMainContent\ListView_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Loading_Blue_16x.png">
-      <Link>Resources\Img\LeftMainContent\Loading_Blue_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Message_16x.png">
-      <Link>Resources\Img\LeftMainContent\Message_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\NotificationHub_16x.png">
-      <Link>Resources\Img\LeftMainContent\NotificationHub_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\NumericListBox_16x.png">
-      <Link>Resources\Img\LeftMainContent\NumericListBox_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Paginator_16x.png">
-      <Link>Resources\Img\LeftMainContent\Paginator_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Panel_16x.png">
-      <Link>Resources\Img\LeftMainContent\Panel_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\PasswordBox_16x.png">
-      <Link>Resources\Img\LeftMainContent\PasswordBox_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Path_16x.png">
-      <Link>Resources\Img\LeftMainContent\Path_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\ProgressBar_16x.png">
-      <Link>Resources\Img\LeftMainContent\ProgressBar_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\ProgressButton_16x.png">
-      <Link>Resources\Img\LeftMainContent\ProgressButton_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\RadioButton_16x.png">
-      <Link>Resources\Img\LeftMainContent\RadioButton_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\RichTextBox_16x.png">
-      <Link>Resources\Img\LeftMainContent\RichTextBox_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\ScrollBox_16x.png">
-      <Link>Resources\Img\LeftMainContent\ScrollBox_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Search_16x.png">
-      <Link>Resources\Img\LeftMainContent\Search_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Shield_16x.png">
-      <Link>Resources\Img\LeftMainContent\Shield_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Slider_16x.png">
-      <Link>Resources\Img\LeftMainContent\Slider_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\SortAscending_grey_16x.png">
-      <Link>Resources\Img\LeftMainContent\SortAscending_grey_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\SplitterControl_16x.png">
-      <Link>Resources\Img\LeftMainContent\SplitterControl_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Star.png">
-      <Link>Resources\Img\LeftMainContent\Star.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\TabPage_16x.png">
-      <Link>Resources\Img\LeftMainContent\TabPage_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Tag_16x.png">
-      <Link>Resources\Img\LeftMainContent\Tag_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\TextBlock_16x.png">
-      <Link>Resources\Img\LeftMainContent\TextBlock_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\TextBox_16x.png">
-      <Link>Resources\Img\LeftMainContent\TextBox_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Timeline_16x.png">
-      <Link>Resources\Img\LeftMainContent\Timeline_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\TimePicker_16x.png">
-      <Link>Resources\Img\LeftMainContent\TimePicker_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Time_color_16x.png">
-      <Link>Resources\Img\LeftMainContent\Time_color_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Toggle_16x.png">
-      <Link>Resources\Img\LeftMainContent\Toggle_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\ToolBar_16x.png">
-      <Link>Resources\Img\LeftMainContent\ToolBar_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Transfer_16x.png">
-      <Link>Resources\Img\LeftMainContent\Transfer_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\TreeView_16x.png">
-      <Link>Resources\Img\LeftMainContent\TreeView_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\User_16x.png">
-      <Link>Resources\Img\LeftMainContent\User_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WindowsForm_16x.png">
-      <Link>Resources\Img\LeftMainContent\WindowsForm_16x.png</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\qq-group.jpg">
-      <Link>Resources\Img\qq-group.jpg</Link>
-    </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\under_construction.gif">
-      <Link>Resources\Img\under_construction.gif</Link>
-    </Resource>
-  </ItemGroup>
-  <Import Project="..\..\Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems" Label="Shared" />
-</Project>
\ No newline at end of file
diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Core_30.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Core_30.csproj
deleted file mode 100644
index 75a878d7..00000000
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Core_30.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <UseWPF>true</UseWPF>
-    <AssemblyName>HandyControl</AssemblyName>
-    <RootNamespace>HandyControl</RootNamespace>
-    <Version>1.5.4</Version>
-    <AssemblyVersion>1.5.4.0</AssemblyVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;Core</DefineConstants>
-  </PropertyGroup>
-  <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
-</Project>
\ No newline at end of file