diff --git a/hdhomeruntray.sln b/hdhomeruntray.sln
index 03e757e..97a3938 100644
--- a/hdhomeruntray.sln
+++ b/hdhomeruntray.sln
@@ -42,32 +42,58 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "setup.findvcmsms", "src\set
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Debug|x64.ActiveCfg = Debug|Win32
+		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Debug|x64.Build.0 = Debug|Win32
 		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Debug|x86.ActiveCfg = Debug|Win32
 		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Debug|x86.Build.0 = Debug|Win32
+		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Release|x64.ActiveCfg = Release|Win32
+		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Release|x64.Build.0 = Release|Win32
 		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Release|x86.ActiveCfg = Release|Win32
 		{8E478C96-0ECF-4A19-AE53-9940E1635D1C}.Release|x86.Build.0 = Release|Win32
+		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Debug|x64.ActiveCfg = Debug|x64
+		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Debug|x64.Build.0 = Debug|x64
 		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Debug|x86.ActiveCfg = Debug|Win32
 		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Debug|x86.Build.0 = Debug|Win32
+		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Release|x64.ActiveCfg = Release|x64
+		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Release|x64.Build.0 = Release|x64
 		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Release|x86.ActiveCfg = Release|Win32
 		{717D3B61-E1FD-4960-8188-0B2215F6A7FB}.Release|x86.Build.0 = Release|Win32
+		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Debug|x64.ActiveCfg = Debug|x64
+		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Debug|x64.Build.0 = Debug|x64
 		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Debug|x86.ActiveCfg = Debug|x86
 		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Debug|x86.Build.0 = Debug|x86
+		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Release|x64.ActiveCfg = Release|x64
+		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Release|x64.Build.0 = Release|x64
 		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Release|x86.ActiveCfg = Release|x86
 		{FE5B686C-C64D-4E48-9B9E-0529897E682E}.Release|x86.Build.0 = Release|x86
+		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Debug|x64.ActiveCfg = Debug|x64
+		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Debug|x64.Build.0 = Debug|x64
 		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Debug|x86.ActiveCfg = Debug|x86
 		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Debug|x86.Build.0 = Debug|x86
+		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Release|x64.ActiveCfg = Release|x64
+		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Release|x64.Build.0 = Release|x64
 		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Release|x86.ActiveCfg = Release|x86
 		{FDB44ABB-98A3-4E3A-8092-6C6C62EAEEDC}.Release|x86.Build.0 = Release|x86
+		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Debug|x64.ActiveCfg = Debug|x64
+		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Debug|x64.Build.0 = Debug|x64
 		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Debug|x86.ActiveCfg = Debug|x86
 		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Debug|x86.Build.0 = Debug|x86
+		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Release|x64.ActiveCfg = Release|x64
+		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Release|x64.Build.0 = Release|x64
 		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Release|x86.ActiveCfg = Release|x86
 		{0B06B689-B001-418C-B01A-A05D1C80A5AA}.Release|x86.Build.0 = Release|x86
+		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Debug|x64.ActiveCfg = Debug|x64
+		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Debug|x64.Build.0 = Debug|x64
 		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Debug|x86.ActiveCfg = Debug|Win32
 		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Debug|x86.Build.0 = Debug|Win32
+		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Release|x64.ActiveCfg = Release|x64
+		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Release|x64.Build.0 = Release|x64
 		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Release|x86.ActiveCfg = Release|Win32
 		{23883491-D011-4A23-B4C1-CC703CBFA2B7}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
diff --git a/msbuild.proj b/msbuild.proj
index dd4076c..bfd0383 100644
--- a/msbuild.proj
+++ b/msbuild.proj
@@ -20,7 +20,7 @@
  SOFTWARE.
 -->
 
-<Project DefaultTargets="windows" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="all" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
     <PackageVersion></PackageVersion>         <!-- Set by PackageVersion Target; may override on the command line -->
@@ -39,8 +39,8 @@
 
   </Target>
 
-  <!-- BUILD: WINDOWS -->
-  <Target Name="windows" DependsOnTargets="PackageVersion">
+  <!-- BUILD: WINDOWS-X86 -->
+  <Target Name="windows-x86" DependsOnTargets="PackageVersion">
 
     <MakeDir Directories="out" ContinueOnError="false"/>
 
@@ -52,19 +52,49 @@
     <MSBuild Projects="src\setup\setup.wixproj" Properties="Configuration=$(Configuration);Platform=x86" Targets="Build" ContinueOnError="false"/>
 
     <ItemGroup>
-      <Packages Include="bin\Release\hdhomeruntray.msi"/>
+      <PackagesX86 Include="bin\Release\x86\hdhomeruntray.msi"/>
     </ItemGroup>
 
-    <Move SourceFiles="@(Packages)" DestinationFiles="@(Packages->Replace('.msi', '-$(PackageVersion).msi'))">
-      <Output TaskParameter="MovedFiles" ItemName="Packages1"/>
+    <Move SourceFiles="@(PackagesX86)" DestinationFiles="@(PackagesX86->Replace('.msi', '-$(PackageVersion)-x86.msi'))">
+      <Output TaskParameter="MovedFiles" ItemName="PackagesX86_1"/>
     </Move>
 
-    <Move SourceFiles="@(Packages1)" DestinationFiles="@(Packages1->Replace('hdhomeruntray', 'hdhomerunstatusmonitor'))">
-      <Output TaskParameter="MovedFiles" ItemName="Packages2"/>
+    <Move SourceFiles="@(PackagesX86_1)" DestinationFiles="@(PackagesX86_1->Replace('hdhomeruntray', 'hdhomerunstatusmonitor'))">
+      <Output TaskParameter="MovedFiles" ItemName="PackagesX86_2"/>
     </Move>
 
-    <Copy SourceFiles="@(Packages2)" DestinationFolder="out"/>
+    <Copy SourceFiles="@(PackagesX86_2)" DestinationFolder="out"/>
 
   </Target>
 
+  <!-- BUILD: WINDOWS-X64 -->
+  <Target Name="windows-x64" DependsOnTargets="PackageVersion">
+
+    <MakeDir Directories="out" ContinueOnError="false"/>
+
+    <MSBuild Targets="Restore" Projects="src\hdhomeruntray\hdhomeruntray.csproj" Properties="SolutionDir=$(MSBuildThisFileDirectory);RestorePackagesConfig=true"/>
+    <MSBuild Projects="src\findvcmsms\findvcmsms.csproj" Properties="Configuration=$(Configuration);Platform=x64" Targets="Build" ContinueOnError="false"/>
+    <MSBuild Projects="src\hdhomeruntray.discovery\hdhomeruntray.discovery.vcxproj" Properties="Configuration=$(Configuration);Platform=x64" Targets="Build" ContinueOnError="false"/>
+    <MSBuild Projects="src\hdhomeruntray\hdhomeruntray.csproj" Properties="Configuration=$(Configuration);Platform=x64" Targets="Build" ContinueOnError="false"/>
+    <MSBuild Projects="src\setup.findvcmsms\setup.findvcmsms.vcxproj" Properties="Configuration=$(Configuration);Platform=x64" Targets="Build" ContinueOnError="false"/>
+    <MSBuild Projects="src\setup\setup.wixproj" Properties="Configuration=$(Configuration);Platform=x64" Targets="Build" ContinueOnError="false"/>
+
+    <ItemGroup>
+      <PackagesX64 Include="bin\Release\x64\hdhomeruntray.msi"/>
+    </ItemGroup>
+
+    <Move SourceFiles="@(PackagesX64)" DestinationFiles="@(PackagesX64->Replace('.msi', '-$(PackageVersion)-x64.msi'))">
+      <Output TaskParameter="MovedFiles" ItemName="PackagesX64_1"/>
+    </Move>
+
+    <Move SourceFiles="@(PackagesX64_1)" DestinationFiles="@(PackagesX64_1->Replace('hdhomeruntray', 'hdhomerunstatusmonitor'))">
+      <Output TaskParameter="MovedFiles" ItemName="PackagesX64_2"/>
+    </Move>
+
+    <Copy SourceFiles="@(PackagesX64_2)" DestinationFolder="out"/>
+
+  </Target>
+
+  <Target Name="all" DependsOnTargets="windows-x86;windows-x64"/>
+
 </Project>
diff --git a/src/findvcmsms/findvcmsms.csproj b/src/findvcmsms/findvcmsms.csproj
index 2e2b004..57afaf1 100644
--- a/src/findvcmsms/findvcmsms.csproj
+++ b/src/findvcmsms/findvcmsms.csproj
@@ -19,7 +19,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\bin\Debug\</OutputPath>
+    <OutputPath>..\..\bin\Debug\x86\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -27,7 +27,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\..\bin\Release\</OutputPath>
+    <OutputPath>..\..\bin\Release\x86\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -35,6 +35,28 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\bin\Debug\x64\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\..\bin\Release\x64\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/src/hdhomeruntray.discovery/hdhomeruntray.discovery.vcxproj b/src/hdhomeruntray.discovery/hdhomeruntray.discovery.vcxproj
index 73a5104..d2dc3e4 100644
--- a/src/hdhomeruntray.discovery/hdhomeruntray.discovery.vcxproj
+++ b/src/hdhomeruntray.discovery/hdhomeruntray.discovery.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -26,6 +34,13 @@
     <CLRSupport>true</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CLRSupport>true</CLRSupport>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -33,6 +48,13 @@
     <CLRSupport>true</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CLRSupport>true</CLRSupport>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -41,21 +63,39 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\</OutDir>
+    <IntDir>obj\$(Configuration)\$(PlatformTarget)\</IntDir>
     <TargetName>$(RootNamespace)</TargetName>
     <LinkKeyFile>$(ProjectDir)..\..\depends\build\zuki-oss.snk</LinkKeyFile>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>$(RootNamespace)</TargetName>
+    <LinkKeyFile>$(ProjectDir)..\..\depends\build\zuki-oss.snk</LinkKeyFile>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\</OutDir>
+    <IntDir>obj\$(Configuration)\$(PlatformTarget)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\</OutDir>
+    <IntDir>obj\$(Configuration)\$(PlatformTarget)\</IntDir>
+    <TargetName>$(RootNamespace)</TargetName>
+    <LinkKeyFile>$(ProjectDir)..\..\depends\build\zuki-oss.snk</LinkKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>$(RootNamespace)</TargetName>
     <LinkKeyFile>$(ProjectDir)..\..\depends\build\zuki-oss.snk</LinkKeyFile>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\</OutDir>
+    <IntDir>obj\$(Configuration)\$(PlatformTarget)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -71,6 +111,20 @@
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\depends\libhdhomerun;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link />
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -85,6 +139,20 @@
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\depends\libhdhomerun;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link />
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\depends\libhdhomerun\hdhomerun.h" />
     <ClInclude Include="..\..\depends\libhdhomerun\hdhomerun_channels.h" />
@@ -129,69 +197,113 @@
   <ItemGroup>
     <ClCompile Include="..\..\depends\libhdhomerun\hdhomerun_channels.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
     </ClCompile>
     <ClCompile Include="..\..\depends\libhdhomerun\hdhomerun_channelscan.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
     </ClCompile>
     <ClCompile Include="..\..\depends\libhdhomerun\hdhomerun_control.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
     </ClCompile>
     <ClCompile Include="..\..\depends\libhdhomerun\hdhomerun_debug.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
     </ClCompile>
     <ClCompile Include="..\..\depends\libhdhomerun\hdhomerun_device.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
     </ClCompile>
     <ClCompile Include="..\..\depends\libhdhomerun\hdhomerun_device_selector.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
     </ClCompile>
     <ClCompile Include="..\..\depends\libhdhomerun\hdhomerun_discover.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
     </ClCompile>
     <ClCompile Include="..\..\depends\libhdhomerun\hdhomerun_os_windows.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
     </ClCompile>
     <ClCompile Include="..\..\depends\libhdhomerun\hdhomerun_pkt.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
     </ClCompile>
     <ClCompile Include="..\..\depends\libhdhomerun\hdhomerun_sock_windows.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
     </ClCompile>
     <ClCompile Include="..\..\depends\libhdhomerun\hdhomerun_video.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
     </ClCompile>
     <ClCompile Include="..\..\tmp\version\version.cpp" />
     <ClCompile Include="AssemblyInfo.cpp" />
@@ -204,9 +316,13 @@
     <ClCompile Include="DiscoveryCompletedEventArgs.cpp" />
     <ClCompile Include="dllmain.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
     </ClCompile>
     <ClCompile Include="LiveBuffer.cpp" />
     <ClCompile Include="LiveBufferList.cpp" />
@@ -218,7 +334,9 @@
     <ClCompile Include="RecordingList.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="StorageDevice.cpp" />
     <ClCompile Include="StorageStatus.cpp" />
diff --git a/src/hdhomeruntray/hdhomeruntray.csproj b/src/hdhomeruntray/hdhomeruntray.csproj
index a5963c0..f33d5cb 100644
--- a/src/hdhomeruntray/hdhomeruntray.csproj
+++ b/src/hdhomeruntray/hdhomeruntray.csproj
@@ -19,7 +19,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\bin\Debug\</OutputPath>
+    <OutputPath>..\..\bin\Debug\x86\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -29,7 +29,7 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\..\bin\Release\</OutputPath>
+    <OutputPath>..\..\bin\Release\x86\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -51,6 +51,26 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>zuki-oss.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\bin\Debug\x64\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\..\bin\Release\x64\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
diff --git a/src/setup.findvcmsms/setup.findvcmsms.vcxproj b/src/setup.findvcmsms/setup.findvcmsms.vcxproj
index 4d36198..830fc6f 100644
--- a/src/setup.findvcmsms/setup.findvcmsms.vcxproj
+++ b/src/setup.findvcmsms/setup.findvcmsms.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\tmp\msm\vcmergemods.wxs" />
@@ -26,6 +34,12 @@
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -33,6 +47,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -41,28 +62,52 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\</OutDir>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\</OutDir>
     <TargetName>$(RootNamespace)</TargetName>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine>"$(OutDir)findvcmsms" "$(VCInstallDir)\" -ver:$(VCToolsRedistVersion) -filter:CRT_x86;DebugCRT_x86 "-out:$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeBuildCommandLine>
+    <IntDir>obj\$(Configuration)\$(PlatformTarget)\</IntDir>
+    <NMakeBuildCommandLine>"$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\findvcmsms" "$(VCInstallDir)\" -ver:$(VCToolsRedistVersion) -filter:CRT_x86;DebugCRT_x86 "-out:$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeBuildCommandLine>
     <NMakeOutput>$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs</NMakeOutput>
-    <NMakeReBuildCommandLine>"$(OutDir)findvcmsms" "$(VCInstallDir)\" -ver:$(VCToolsRedistVersion) -filter:CRT_x86;DebugCRT_x86 "-out:$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>"$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\findvcmsms" "$(VCInstallDir)\" -ver:$(VCToolsRedistVersion) -filter:CRT_x86;DebugCRT_x86 "-out:$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>if exist "$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs" del "$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeCleanCommandLine>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <NMakeBuildCommandLine>"$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\findvcmsms" "$(VCInstallDir)\" -ver:$(VCToolsRedistVersion) -filter:CRT_x86;DebugCRT_x86;CRT_x64;DebugCRT_x64 "-out:$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeBuildCommandLine>
+    <NMakeOutput>$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs</NMakeOutput>
+    <NMakeReBuildCommandLine>"$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\findvcmsms" "$(VCInstallDir)\" -ver:$(VCToolsRedistVersion) -filter:CRT_x86;DebugCRT_x86;CRT_x64;DebugCRT_x64 "-out:$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>if exist "$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs" del "$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeCleanCommandLine>
+    <TargetName>$(RootNamespace)</TargetName>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\</OutDir>
+    <IntDir>obj\$(Configuration)\$(PlatformTarget)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\</OutDir>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\</OutDir>
     <TargetName>$(RootNamespace)</TargetName>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine>"$(OutDir)findvcmsms" "$(VCInstallDir)\" -ver:$(VCToolsRedistVersion) -filter:CRT_x86 "-out:$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>"$(OutDir)findvcmsms" "$(VCInstallDir)\" -ver:$(VCToolsRedistVersion) -filter:CRT_x86 "-out:$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeReBuildCommandLine>
+    <IntDir>obj\$(Configuration)\$(PlatformTarget)\</IntDir>
+    <NMakeBuildCommandLine>"$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\findvcmsms" "$(VCInstallDir)\" -ver:$(VCToolsRedistVersion) -filter:CRT_x86 "-out:$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>"$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\findvcmsms" "$(VCInstallDir)\" -ver:$(VCToolsRedistVersion) -filter:CRT_x86 "-out:$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>if exist "$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs" del "$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeCleanCommandLine>
     <NMakeOutput>$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs</NMakeOutput>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <NMakeBuildCommandLine>"$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\findvcmsms" "$(VCInstallDir)\" -ver:$(VCToolsRedistVersion) -filter:CRT_x86;CRT_x64 "-out:$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>"$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\findvcmsms" "$(VCInstallDir)\" -ver:$(VCToolsRedistVersion) -filter:CRT_x86;CRT_x64 "-out:$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>if exist "$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs" del "$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs"</NMakeCleanCommandLine>
+    <NMakeOutput>$(ProjectDir)..\..\tmp\msm\vcmergemods.wxs</NMakeOutput>
+    <TargetName>$(RootNamespace)</TargetName>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\</OutDir>
+    <IntDir>obj\$(Configuration)\$(PlatformTarget)\</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -70,6 +115,13 @@
       <SDLCheck>true</SDLCheck>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -83,6 +135,19 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/setup/addvcrt.wxi b/src/setup/addvcrt.wxi
index 5c7316e..299ba24 100644
--- a/src/setup/addvcrt.wxi
+++ b/src/setup/addvcrt.wxi
@@ -7,10 +7,18 @@
     file should be thrown into each <Feature> element in the main isrp_setup.wxs file
   -->
 
-  <MergeRef Id="Microsoft_VC142_CRT_x86"/>
-
-  <?if $(var.Configuration) = "Debug" ?>
-  <MergeRef Id="Microsoft_VC142_DebugCRT_x86"/>
+  <?if $(var.Platform) = "x86" ?>
+    <MergeRef Id="Microsoft_VC142_CRT_x86"/>
+    <?if $(var.Configuration) = "Debug" ?>
+    <MergeRef Id="Microsoft_VC142_DebugCRT_x86"/>
+    <?endif?>
+  <?else?>
+    <MergeRef Id="Microsoft_VC142_CRT_x86"/>
+    <MergeRef Id="Microsoft_VC142_CRT_x64"/>
+    <?if $(var.Configuration) = "Debug" ?>
+      <MergeRef Id="Microsoft_VC142_DebugCRT_x86"/>
+      <MergeRef Id="Microsoft_VC142_DebugCRT_x64"/>
+    <?endif?>
   <?endif?>
 
 </Include>
diff --git a/src/setup/buildenv.wxi b/src/setup/buildenv.wxi
index 9e2b301..eb07902 100644
--- a/src/setup/buildenv.wxi
+++ b/src/setup/buildenv.wxi
@@ -7,7 +7,11 @@
 
   <!-- ProjectBinFolder -->
   <!-- Set to the platform-specific \bin path  for the project -->
-  <?define ProjectBinFolder = $(var.ProjectDir)..\..\bin\$(var.Configuration)\ ?>
+  <?if $(var.Platform) = "x86" ?>
+  <?define ProjectBinFolder = $(var.ProjectDir)..\..\bin\$(var.Configuration)\x86\ ?>
+  <?else?>
+  <?define ProjectBinFolder = $(var.ProjectDir)..\..\bin\$(var.Configuration)\x64\ ?>
+  <?endif?>
 
   <!-- ProjectDependsFolder -->
   <!-- Set to the root \depends path for the project -->
diff --git a/src/setup/setup.wixproj b/src/setup/setup.wixproj
index 82c4fb8..d04ade6 100644
--- a/src/setup/setup.wixproj
+++ b/src/setup/setup.wixproj
@@ -10,18 +10,31 @@
     <OutputType>Package</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>..\..\bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <OutputPath>..\..\bin\$(Configuration)\x86\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\x86\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
     <DefineSolutionProperties>false</DefineSolutionProperties>
     <SuppressIces>ICE03</SuppressIces>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\..\bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <OutputPath>..\..\bin\$(Configuration)\x86\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\x86\</IntermediateOutputPath>
     <DefineSolutionProperties>false</DefineSolutionProperties>
     <SuppressIces>ICE03</SuppressIces>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DefineConstants>Debug</DefineConstants>
+    <DefineSolutionProperties>false</DefineSolutionProperties>
+    <SuppressIces>ICE03</SuppressIces>
+    <OutputPath>..\..\bin\$(Configuration)\x64\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\x64\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <DefineSolutionProperties>false</DefineSolutionProperties>
+    <SuppressIces>ICE03</SuppressIces>
+    <OutputPath>..\..\bin\$(Configuration)\x64\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\x64\</IntermediateOutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\tmp\msm\vcmergemods.wxs">
       <Link>vcmergemods.wxs</Link>
diff --git a/src/setup/setup.wxs b/src/setup/setup.wxs
index cf45a58..f00e05e 100644
--- a/src/setup/setup.wxs
+++ b/src/setup/setup.wxs
@@ -14,7 +14,8 @@
     Manufacturer="ZukiSoft"
     UpgradeCode="E9655935-8B9E-4BB4-A452-302EF25F0232"> <!-- NEVER CHANGE THE UPGRADE CODE -->
 
-    <Package InstallerVersion="405" Compressed="yes" InstallPrivileges="elevated" InstallScope="perMachine"/>
+    <Package InstallerVersion="405" Compressed="yes" InstallPrivileges="elevated" InstallScope="perMachine" Platform="$(var.Platform)"/>
+    
     <Media Id="1" Cabinet="hdhomeruntray.cab" EmbedCab="yes" />
 
     <!-- UPGRADES -->
@@ -42,13 +43,22 @@
 
     <Directory Id="TARGETDIR" Name="SourceDir">
 
-      <!-- C:\Program Files (x86)\ZukiSoft\HDHomeRun Status Monitor -->
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="ZukiSoftBinFolder" Name="ZukiSoft">
-          <Directory Id="HDHomeRunTrayBinFolder" Name="HDHomeRun Status Monitor"/>
+      <?if $(var.Platform) = "x86" ?>
+        <!-- C:\Program Files (x86)\ZukiSoft\HDHomeRun Status Monitor -->
+        <Directory Id="ProgramFilesFolder">
+          <Directory Id="ZukiSoftBinFolder" Name="ZukiSoft">
+            <Directory Id="HDHomeRunTrayBinFolder" Name="HDHomeRun Status Monitor"/>
+          </Directory>
         </Directory>
-      </Directory>
-
+      <?else?>
+        <!-- C:\Program Files\ZukiSoft\HDHomeRun Status Monitor -->
+        <Directory Id="ProgramFiles64Folder">
+          <Directory Id="ZukiSoftBinFolder" Name="ZukiSoft">
+            <Directory Id="HDHomeRunTrayBinFolder" Name="HDHomeRun Status Monitor"/>
+          </Directory>
+        </Directory>
+      <?endif?>
+      
       <!-- Fonts -->
       <Directory Id="FontsFolder"/>
 
diff --git a/src/version/version.vcxproj b/src/version/version.vcxproj
index 28638eb..a96b76e 100644
--- a/src/version/version.vcxproj
+++ b/src/version/version.vcxproj
@@ -43,13 +43,13 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetName>$(RootNamespace)</TargetName>
-    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\</OutDir>
+    <IntDir>obj\$(Configuration)\$(PlatformTarget)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetName>$(RootNamespace)</TargetName>
-    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)\$(PlatformTarget)\</OutDir>
+    <IntDir>obj\$(Configuration)\$(PlatformTarget)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>