diff --git a/PreSolutionBuild/PreSolutionBuild.vcxproj b/PreSolutionBuild/PreSolutionBuild.vcxproj
index 1759d69663..aae8e8ffd7 100644
--- a/PreSolutionBuild/PreSolutionBuild.vcxproj
+++ b/PreSolutionBuild/PreSolutionBuild.vcxproj
@@ -21,6 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{88731DA8-C020-476E-B79A-3ADEF65ACA9F}</ProjectGuid>
     <Keyword>MakeFileProj</Keyword>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -34,12 +35,12 @@
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
@@ -63,11 +64,25 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeBuildCommandLine>taskkill /f /fi "IMAGENAME eq Wox.exe"</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>taskkill /f /fi "IMAGENAME eq Wox.exe"
+$(SolutionDir)Output\$(Configuration)\Plugins\Wox.Plugin.Everything\PortableEverything\$(PlatformTarget)\Everything.exe -stop-service
+</NMakeBuildCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeBuildCommandLine>taskkill /f /fi "IMAGENAME eq Wox.exe"</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>taskkill /f /fi "IMAGENAME eq Wox.exe"
+$(SolutionDir)Output\$(Configuration)\Plugins\Wox.Plugin.Everything\PortableEverything\$(PlatformTarget)\Everything.exe -stop-service
+</NMakeBuildCommandLine>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <NMakeBuildCommandLine>taskkill /f /fi "IMAGENAME eq Wox.exe"
+$(SolutionDir)Output\$(Configuration)\Plugins\Wox.Plugin.Everything\PortableEverything\$(PlatformTarget)\Everything.exe -stop-service
+</NMakeBuildCommandLine>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <NMakeBuildCommandLine>taskkill /f /fi "IMAGENAME eq Wox.exe"
+$(SolutionDir)Output\$(Configuration)\Plugins\Wox.Plugin.Everything\PortableEverything\$(PlatformTarget)\Everything.exe -stop-service
+</NMakeBuildCommandLine>
   </PropertyGroup>
   <ItemDefinitionGroup>
   </ItemDefinitionGroup>
diff --git a/Wox.sln b/Wox.sln
index 7fb7e702ba..6fa8472307 100644
--- a/Wox.sln
+++ b/Wox.sln
@@ -270,6 +270,7 @@ Global
 		{A3DCCBCA-ACC1-421D-B16E-210896234C26}.Debug|x86.Build.0 = Debug|Any CPU
 		{A3DCCBCA-ACC1-421D-B16E-210896234C26}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3DCCBCA-ACC1-421D-B16E-210896234C26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3DCCBCA-ACC1-421D-B16E-210896234C26}.Release|Any CPU.Deploy.0 = Release|Any CPU
 		{A3DCCBCA-ACC1-421D-B16E-210896234C26}.Release|x64.ActiveCfg = Release|Any CPU
 		{A3DCCBCA-ACC1-421D-B16E-210896234C26}.Release|x64.Build.0 = Release|Any CPU
 		{A3DCCBCA-ACC1-421D-B16E-210896234C26}.Release|x86.ActiveCfg = Release|Any CPU
@@ -317,7 +318,6 @@ Global
 		{88731DA8-C020-476E-B79A-3ADEF65ACA9F}.Debug|x86.ActiveCfg = Debug|Win32
 		{88731DA8-C020-476E-B79A-3ADEF65ACA9F}.Debug|x86.Build.0 = Debug|Win32
 		{88731DA8-C020-476E-B79A-3ADEF65ACA9F}.Release|Any CPU.ActiveCfg = Release|Win32
-		{88731DA8-C020-476E-B79A-3ADEF65ACA9F}.Release|Any CPU.Build.0 = Release|Win32
 		{88731DA8-C020-476E-B79A-3ADEF65ACA9F}.Release|x64.ActiveCfg = Release|x64
 		{88731DA8-C020-476E-B79A-3ADEF65ACA9F}.Release|x64.Build.0 = Release|x64
 		{88731DA8-C020-476E-B79A-3ADEF65ACA9F}.Release|x86.ActiveCfg = Release|Win32