diff --git a/FluentWPF.sln b/FluentWPF.sln
index 2617b06..2bbdff0 100644
--- a/FluentWPF.sln
+++ b/FluentWPF.sln
@@ -1,10 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2005
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28917.181
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentWPF", "FluentWPF\FluentWPF.csproj", "{061B1DD9-815B-437F-8CD6-D20923BC0AF4}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{6FD229DB-B096-4A05-A025-88D06AE274B9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentWPFSample", "Sample\FluentWPFSample\FluentWPFSample.csproj", "{CCAC5625-C8EE-49C5-8407-ACC8289CCC81}"
@@ -14,7 +12,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nuget", "Nuget", "{76CF6319
 		Nuget\pack.bat = Nuget\pack.bat
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetCoreSample", "Sample\NetCoreSample\NetCoreSample.csproj", "{4E60C7EA-CC99-4D22-AE70-4461015C10E5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCoreSample", "Sample\NetCoreSample\NetCoreSample.csproj", "{4E60C7EA-CC99-4D22-AE70-4461015C10E5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentWPF", "FluentWPF\FluentWPF.csproj", "{0EFDC126-556C-431D-B0DF-BACB8AB445B6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,10 +22,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{061B1DD9-815B-437F-8CD6-D20923BC0AF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{061B1DD9-815B-437F-8CD6-D20923BC0AF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{061B1DD9-815B-437F-8CD6-D20923BC0AF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{061B1DD9-815B-437F-8CD6-D20923BC0AF4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CCAC5625-C8EE-49C5-8407-ACC8289CCC81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CCAC5625-C8EE-49C5-8407-ACC8289CCC81}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CCAC5625-C8EE-49C5-8407-ACC8289CCC81}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -34,6 +30,10 @@ Global
 		{4E60C7EA-CC99-4D22-AE70-4461015C10E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4E60C7EA-CC99-4D22-AE70-4461015C10E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4E60C7EA-CC99-4D22-AE70-4461015C10E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EFDC126-556C-431D-B0DF-BACB8AB445B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EFDC126-556C-431D-B0DF-BACB8AB445B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EFDC126-556C-431D-B0DF-BACB8AB445B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0EFDC126-556C-431D-B0DF-BACB8AB445B6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/FluentWPF/FluentWPF.csproj b/FluentWPF/FluentWPF.csproj
index 754233e..0ef8e7a 100644
--- a/FluentWPF/FluentWPF.csproj
+++ b/FluentWPF/FluentWPF.csproj
@@ -1,154 +1,55 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{061B1DD9-815B-437F-8CD6-D20923BC0AF4}</ProjectGuid>
-    <OutputType>library</OutputType>
+    <OutputType>Library</OutputType>
+    <TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
+    <UseWPF>true</UseWPF>
     <RootNamespace>SourceChord.FluentWPF</RootNamespace>
-    <AssemblyName>FluentWPF</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+  <PropertyGroup>
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateAssemblyTrademarkAttribute>false</GenerateAssemblyTrademarkAttribute>
+    <GenerateAssemblyCultureAttribute>false</GenerateAssemblyCultureAttribute>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+
+    <PackageProjectUrl>https://github.com/sourcechord/FluentWPF</PackageProjectUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/sourcechord/FluentWPF/master/logo.png</PackageIconUrl>
+    <PackageTags>WPF XAML Fluent Design Theme Library</PackageTags>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <Version>0.8.0-alpha</Version>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AcrylicContextMenu.cs" />
-    <Compile Include="AcrylicPopup.cs" />
-    <Compile Include="Animations\BrushAnimation.cs" />
-    <Compile Include="Extensions.cs" />
-    <Compile Include="Resources\ResourceDictionaryEx.cs" />
-    <Compile Include="Resources\SystemTheme.cs" />
-    <Compile Include="Resources\ThemeHandler.cs" />
-    <Compile Include="Utility\AcrylicHelper.cs" />
-    <Compile Include="Utility\IconHelper.cs" />
-    <Compile Include="Utility\SystemInfo.cs" />
-    <Compile Include="Utility\VersionInfo.cs" />
-    <Compile Include="Utility\VersionInfos.cs" />
-    <Page Include="Styles\Button.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\Brushes.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\Colors.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\Controls.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\ListBox.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\Menu.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\ScrollBar.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\TextBox.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\Window.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="Resources\AccentColors.cs" />
-    <Compile Include="AcrylicBrush.cs" />
-    <Compile Include="AcrylicPanel.cs" />
-    <Compile Include="AcrylicWindow.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DropShadowPanel.cs" />
-    <Compile Include="ParallaxView.cs" />
-    <Compile Include="PointerTracker.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="FluentWPF.nuspec" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    <None Remove="Assets\Images\noise.png" />
+    <None Remove="Assets\Images\noiseBlack.png" />
+    <None Remove="Assets\Images\noiseWhite.png" />
+    <None Remove="Styles\Brushes.xaml" />
+    <None Remove="Styles\Button.xaml" />
+    <None Remove="Styles\Colors.Dark.xaml" />
+    <None Remove="Styles\Colors.Light.xaml" />
+    <None Remove="Styles\Colors.xaml" />
+    <None Remove="Styles\Controls.xaml" />
+    <None Remove="Styles\ListBox.xaml" />
+    <None Remove="Styles\Menu.xaml" />
+    <None Remove="Styles\ScrollBar.xaml" />
+    <None Remove="Styles\TextBox.xaml" />
+    <None Remove="Styles\Window.xaml" />
+    <None Remove="Themes\Generic.xaml" />
+    <None Include="..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
     </None>
-    <Page Include="Styles\Colors.Dark.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Styles\Colors.Light.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
   </ItemGroup>
+
   <ItemGroup>
     <Resource Include="Assets\Images\noise.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Assets\Images\noiseWhite.png" />
-  </ItemGroup>
-  <ItemGroup>
     <Resource Include="Assets\Images\noiseBlack.png" />
+    <Resource Include="Assets\Images\noiseWhite.png" />
   </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/FluentWPF/FluentWPF.nuspec b/FluentWPF/FluentWPF.nuspec
deleted file mode 100644
index 70eab82..0000000
--- a/FluentWPF/FluentWPF.nuspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <authors>$author$</authors>
-    <owners>$author$</owners>
-    <licenseUrl>https://github.com/sourcechord/FluentWPF/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/sourcechord/FluentWPF</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/sourcechord/FluentWPF/master/logo.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <copyright>Copyright 2017</copyright>
-    <tags>WPF XAML Fluent Design Theme Library</tags>
-  </metadata>
-</package>
\ No newline at end of file
diff --git a/FluentWPF/Properties/AssemblyInfo.cs b/FluentWPF/Properties/AssemblyInfo.cs
index 9fee8e7..8172cc7 100644
--- a/FluentWPF/Properties/AssemblyInfo.cs
+++ b/FluentWPF/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.0.0")]
-[assembly: AssemblyFileVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.8.0.0")]
+[assembly: AssemblyFileVersion("0.8.0.0")]
diff --git a/FluentWPF/Properties/Settings.Designer.cs b/FluentWPF/Properties/Settings.Designer.cs
index d4c3aaf..99f0685 100644
--- a/FluentWPF/Properties/Settings.Designer.cs
+++ b/FluentWPF/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace SourceChord.FluentWPF.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.1.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Nuget/pack.bat b/Nuget/pack.bat
index 8d6bf96..be0138b 100644
--- a/Nuget/pack.bat
+++ b/Nuget/pack.bat
@@ -1,2 +1,5 @@
-nuget pack ..\FluentWPF\FluentWPF.csproj -Build -Properties Configuration=Release
+set OutDir=%CD%
+pushd ..\FluentWPF
+dotnet pack -c Release -o %OutDir%
+popd
 pause
diff --git a/Sample/FluentWPFSample/FluentWPFSample.csproj b/Sample/FluentWPFSample/FluentWPFSample.csproj
index d506d9c..53c2f7a 100644
--- a/Sample/FluentWPFSample/FluentWPFSample.csproj
+++ b/Sample/FluentWPFSample/FluentWPFSample.csproj
@@ -198,17 +198,17 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\FluentWPF\FluentWPF.csproj">
-      <Project>{061b1dd9-815b-437f-8cd6-d20923bc0af4}</Project>
-      <Name>FluentWPF</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Assets\Images\1.jpg" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Assets\Images\logo_icon.png" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\FluentWPF\FluentWPF.csproj">
+      <Project>{0efdc126-556c-431d-b0df-bacb8ab445b6}</Project>
+      <Name>FluentWPF</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Sample/NetCoreSample/NetCoreSample.csproj b/Sample/NetCoreSample/NetCoreSample.csproj
index 5fb48ae..f832c6e 100644
--- a/Sample/NetCoreSample/NetCoreSample.csproj
+++ b/Sample/NetCoreSample/NetCoreSample.csproj
@@ -6,6 +6,10 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <PlatformTarget></PlatformTarget>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\FluentWPF\FluentWPF.csproj" />
   </ItemGroup>