diff --git a/Wox.Core/FodyWeavers.xml b/Wox.Core/FodyWeavers.xml
new file mode 100644
index 0000000000..bb0f322ee9
--- /dev/null
+++ b/Wox.Core/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file
diff --git a/Wox.Core/UserSettings/Settings.cs b/Wox.Core/UserSettings/Settings.cs
index 2487fcb2f8..068e8217a9 100644
--- a/Wox.Core/UserSettings/Settings.cs
+++ b/Wox.Core/UserSettings/Settings.cs
@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
-using Wox.Core.Plugin;
-using Wox.Plugin;
 using Newtonsoft.Json;
+using PropertyChanged;
 
 namespace Wox.Core.UserSettings
 {
+    [ImplementPropertyChanged]
     public class Settings
     {
         public string Hotkey { get; set; } = "Alt + Space";
diff --git a/Wox.Core/Wox.Core.csproj b/Wox.Core/Wox.Core.csproj
index 7debf7a622..908689e1f2 100644
--- a/Wox.Core/Wox.Core.csproj
+++ b/Wox.Core/Wox.Core.csproj
@@ -140,7 +140,17 @@
       <Name>Wox.Plugin</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.2\build\dotnet\Fody.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.2\build\dotnet\Fody.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Wox.Core/packages.config b/Wox.Core/packages.config
index ebbc95d4a4..573bc51f3e 100644
--- a/Wox.Core/packages.config
+++ b/Wox.Core/packages.config
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DeltaCompressionDotNet" version="1.0.0" targetFramework="net452" />
+  <package id="Fody" version="1.29.2" targetFramework="net452" developmentDependency="true" />
   <package id="JetBrains.Annotations" version="10.1.4" targetFramework="net452" />
   <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
+  <package id="PropertyChanged.Fody" version="1.51.0" targetFramework="net452" developmentDependency="true" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net452" />
   <package id="Splat" version="1.6.2" targetFramework="net452" />
   <package id="squirrel.windows" version="1.4.0" targetFramework="net452" />