diff --git a/CHANGELOG.md b/CHANGELOG.md
index c677b9df..1ffdb7ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+v1.1.25
+-------
+
+ - Add touch support
+ - Minor UI updates (#538, #540, #541, #543)
+
 v1.1.24
 -------
 
diff --git a/LICENSE.txt b/LICENSE.txt
index bf74aa21..e52114ed 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2017 Antony Male
+Copyright (c) 2015-2021 Antony Male
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 8393749a..4fe468fe 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ If you already have SyncTrayzor installed, this will update it.
 
 ### Standalone
 
-First, you'll need .net 4.5. [Download the offline](https://www.microsoft.com/en-gb/download/details.aspx?id=42642) or [web installer](https://www.microsoft.com/en-gb/download/details.aspx?id=42643) if you don't have it installed already.
+First, you'll need .net 4.7.2. [Download the offline](https://support.microsoft.com/en-gb/help/4054530/microsoft-net-framework-4-7-2-offline-installer-for-windows) or [web installer](https://support.microsoft.com/en-gb/help/4054531/microsoft-net-framework-4-7-2-web-installer-for-windows) if you don't have it installed already.
 
 [Download `SyncTrayzorPortable-x64.zip` or `SyncTrayzorPortable-x86.zip`](https://github.com/canton7/SyncTrayzor/releases/latest).
 Unzip, and run `SyncTrayzor.exe`. If you're updating, you'll need to copy the `data` folder across from your previous standalone installation.
diff --git a/Rakefile b/Rakefile
index ebcdddcf..0392f801 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,13 +4,12 @@ require 'open-uri'
 require_relative 'build/TxClient'
 require_relative 'build/CsprojResxWriter'
 
-ISCC = ENV['ISCC'] || 'C:\Program Files (x86)\Inno Setup 5\ISCC.exe'
-SZIP = ENV['SZIP'] || 'C:\Program Files\7-Zip\7z.exe'
+ISCC = ENV['ISCC'] || 'C:\Program Files (x86)\Inno Setup 6\ISCC.exe'
+SZIP = ENV['SZIP'] || File.join(__dir__, 'build', '7za.exe')
 SIGNTOOL = ENV['SIGNTOOL'] || 'C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe'
 VSWHERE = 'build/vswhere.exe'
 
 CONFIG = ENV['CONFIG'] || 'Release'
-MSBUILD_VERSION = '15.0'
 MSBUILD_LOGGER = ENV['MSBUILD_LOGGER']
 
 SRC_DIR = 'src/SyncTrayzor'
@@ -67,30 +66,24 @@ SYNCTHING_VERSIONS_TO_UPDATE = ['latest']
 ARCH_CONFIG = [ArchDirConfig.new('x64', 'amd64'), ArchDirConfig.new('x86', '386')]
 ASSEMBLY_INFOS = FileList['**/AssemblyInfo.cs']
 
-def ensure_7zip
-  unless File.exist?(SIGNTOOL)
-    warn "You must install the Windows SDK"
-    exit 1
-  end
-end
-
 def build(sln, platform, rebuild = true)
   if ENV['MSBUILD']
     msbuild = ENV['MSBUILD']
   else
-    path = `#{VSWHERE} -version #{MSBUILD_VERSION} -requires Microsoft.Component.MSBuild -format value -property installationPath`.chomp
-    msbuild = File.join(path, 'MSBuild', MSBUILD_VERSION, 'Bin', 'MSBuild.exe')
+    path = `#{VSWHERE} -requires Microsoft.Component.MSBuild -format value -property installationPath`.chomp
+    msbuild = File.join(path, 'MSBuild', 'Current', 'Bin', 'MSBuild.exe')
   end
 
   puts "MSBuild is at #{msbuild}"
   tasks = rebuild ? 'Clean;Rebuild' : 'Build'
-  cmd = "\"#{msbuild}\" \"#{sln}\" /t:#{tasks} /p:Configuration=#{CONFIG};Platform=#{platform}"
+  cmd = "\"#{msbuild}\" \"#{sln}\" -t:#{tasks} -p:Configuration=#{CONFIG};Platform=#{platform}"
   if MSBUILD_LOGGER
-    cmd << " /logger:\"#{MSBUILD_LOGGER}\" /verbosity:minimal"
+    cmd << " -logger:\"#{MSBUILD_LOGGER}\" /verbosity:minimal"
   else
-    cmd << " /verbosity:quiet"
+    cmd << " -verbosity:quiet"
   end
   
+  puts cmd
   sh cmd
 end
 
@@ -135,7 +128,11 @@ namespace :"sign-installer" do
   ARCH_CONFIG.each do |arch_config|
     desc "Sign the installer (#{arch_config.arch}). Specify PASSWORD if required"
     task arch_config.arch do
-      ensure_7zip
+
+      unless File.exist?(SIGNTOOL)
+        warn "You must install the Windows SDK"
+        exit 1
+      end
 
       unless File.exist?(PFX)
         warn "#{PFX} must exist"
@@ -171,8 +168,6 @@ namespace :portable do
   ARCH_CONFIG.each do |arch_config|
     desc "Create the portable package (#{arch_config.arch})"
     task arch_config.arch do
-      ensure_7zip
-
       mkdir_p File.dirname(arch_config.portable_output_file)
       rm arch_config.portable_output_file if File.exist?(arch_config.portable_output_file)
 
@@ -257,6 +252,7 @@ task :package => [:clean, *ARCH_CONFIG.map{ |x| :"package:#{x.arch}" }, :"create
 desc 'Build chocolatey package'
 task :chocolatey do
   chocolatey_dir = File.dirname(CHOCOLATEY_NUSPEC)
+  cp Dir[File.join(DEPLOY_DIR, 'SyncTrayzorSetup-*.exe')], File.join(chocolatey_dir, 'tools')
   Dir.chdir(chocolatey_dir) do
     sh "choco pack"
   end
@@ -289,8 +285,6 @@ namespace :syncthing do
     ARCH_CONFIG.each do |arch_config|
       desc "Download syncthing (#{arch_config.arch})"
       task arch_config.arch, [:version] => [:"build-checksum-util"] do |t, args|
-        ensure_7zip
-
         Dir.mktmpdir do |tmp|
           download_file = File.join(tmp, File.basename(arch_config.download_uri(args[:version])))
           File.open(download_file, 'wb') do |outfile|
diff --git a/build/7za.exe b/build/7za.exe
new file mode 100644
index 00000000..2bdd57d2
Binary files /dev/null and b/build/7za.exe differ
diff --git a/chocolatey/synctrayzor.nuspec b/chocolatey/synctrayzor.nuspec
index 12d81277..ba956d89 100644
--- a/chocolatey/synctrayzor.nuspec
+++ b/chocolatey/synctrayzor.nuspec
@@ -40,7 +40,7 @@ Features include:
     <tags>synctrayzor syncthing synchronization admin</tags>
     <licenseUrl>https://raw.githubusercontent.com/canton7/SyncTrayzor/master/LICENSE.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>https://cdn.rawgit.com/canton7/SyncTrayzor/develop/SyncTrayzor.png</iconUrl>
+    <iconUrl>https://cdn.statically.io/gh/canton7/SyncTrayzor/develop/SyncTrayzor.png</iconUrl>
     <dependencies>
       <!-- Chocolatey 0.9.9 required in order to access the chocolateyPackageName and chocolateyPackageVersion environment variables -->
       <dependency id="chocolatey" version="0.9.9" />
diff --git a/chocolatey/tools/chocolateyinstall.ps1 b/chocolatey/tools/chocolateyinstall.ps1
index d2fe657b..cc86fd40 100644
--- a/chocolatey/tools/chocolateyinstall.ps1
+++ b/chocolatey/tools/chocolateyinstall.ps1
@@ -1,10 +1,13 @@
 $ErrorActionPreference = 'Stop'; # stop on all errors
+$toolsDir              = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
 
 $packageName= 'SyncTrayzor'
-$url        = "https://github.com/canton7/SyncTrayzor/releases/download/v${env:chocolateyPackageVersion}/SyncTrayzorSetup-x86.exe"
-$url64      = "https://github.com/canton7/SyncTrayzor/releases/download/v${env:chocolateyPackageVersion}/SyncTrayzorSetup-x64.exe"
+$file       = (Join-Path $toolsDir 'SyncTrayzorSetup-x86.exe')
+$file64     = (Join-Path $toolsDir 'SyncTrayzorSetup-x64.exe')
 $silentArgs = '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-'
 $fileType   = 'exe'
 $validExitCodes = @(0)
 
-Install-ChocolateyPackage $packageName $fileType $silentArgs $url $url64 -validExitCodes $validExitCodes
+Install-ChocolateyInstallPackage $packageName $fileType $silentArgs $file $file64 -validExitCodes $validExitCodes
+
+Remove-Item -Force -ea 0 $file, $file64
\ No newline at end of file
diff --git a/installer/common.iss b/installer/common.iss
index 5ff04631..7afc1448 100644
--- a/installer/common.iss
+++ b/installer/common.iss
@@ -1,17 +1,17 @@
+
 #define AppExeName "SyncTrayzor.exe"
 #define AppRoot "..\.."
 #define AppSrc AppRoot + "\src\SyncTrayzor"
 #define AppBin AppRoot +"\bin\" + Arch + "\Release"
 #define AppExe AppBin + "\SyncTrayzor.exe"
 #define AppName GetStringFileInfo(AppExe, "ProductName")
-#define AppVersion GetFileVersion(AppExe)
+#define AppVersion GetVersionNumbersString(AppExe)
 #define AppPublisher "SyncTrayzor"
 #define AppURL "https://github.com/canton7/SyncTrayzor"
 #define AppDataFolder "SyncTrayzor"
 #define RunRegKey "Software\Microsoft\Windows\CurrentVersion\Run"
-#define DotNetInstallerExe "dotNet451Setup.exe"
+#define DotNetInstallerExe "dotNet472Setup.exe"
 #define DonateUrl "https://synctrayzor.antonymale.co.uk/donate"
-#define SurveyUrl "https://synctrayzor.antonymale.co.uk/survey.php"
 
 [Setup]
 AppId={{#AppId}
@@ -23,7 +23,7 @@ AppPublisher={#AppPublisher}
 AppPublisherURL={#AppURL}
 AppSupportURL={#AppURL}
 AppUpdatesURL={#AppURL}
-DefaultDirName={pf}\{#AppName}
+DefaultDirName={commonpf}\{#AppName}
 DefaultGroupName={#AppName}
 AllowNoIcons=yes
 LicenseFile={#AppRoot}\LICENSE.txt
@@ -86,16 +86,15 @@ Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(
 [Code]
 var
   GlobalRestartRequired: boolean;
-  UninstallPollPage: TNewNotebookPage;
-  UninstallNextButton: TNewButton;
 
 function DotNetIsMissing(): Boolean;
 var 
   Exists: Boolean;
   Release: Cardinal;
 begin
+  // https://docs.microsoft.com/en-us/dotnet/framework/migration-guide/how-to-determine-which-versions-are-installed#minimum-version
   Exists := RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', Release);
-  Result := not Exists or (Release < 378758);
+  Result := not Exists or (Release < 461808);
 end;
 
 // Adapted from https://blogs.msdn.microsoft.com/davidrickard/2015/07/17/installing-net-framework-4-5-automatically-with-inno-setup/
@@ -166,9 +165,9 @@ end;
 
 procedure URLLabelOnClick(Sender: TObject);
 var
-	ErrorCode: Integer;
+  ErrorCode: Integer;
 begin
-	ShellExec('open', '{#DonateUrl}', '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode);
+  ShellExec('open', '{#DonateUrl}', '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode);
 end;
 
 procedure InitializeWizard;
@@ -180,8 +179,8 @@ begin
   URLLabel.Cursor := crHand;
   URLLabel.Parent := WizardForm;
   URLLabel.Font.Style := URLLabel.Font.Style + [fsUnderline];
-	URLLabel.Font.Color := clBlue;
-	URLLabel.Top := WizardForm.ClientHeight - URLLabel.Height - 15;
+  URLLabel.Font.Color := clBlue;
+  URLLabel.Top := WizardForm.ClientHeight - URLLabel.Height - 15;
   URLLabel.Left := ScaleX(10)
   URLLabel.OnClick := @URLLabelOnClick;
 end;
@@ -241,11 +240,6 @@ begin
   end
 end;
 
-procedure CurPageChanged(CurPageID: Integer);
-begin
-
-end;
-
 function PrepareToInstall(var NeedsRestart: Boolean): String;
 begin
   // 'NeedsRestart' only has an effect if we return a non-empty string, thus aborting the installation.
@@ -288,172 +282,8 @@ begin
    end;
 end;
 
-function SerializeBool(value: Boolean): String;
-begin
-  if value then begin
-    Result := 'true';
-  end else begin
-    Result := 'false';
-  end
-end;
-
-function EscapeJsonString(value: String): String;
-var
-  c: Char;
-  i: Integer;
-begin
-  // http://www.jrsoftware.org/ishelp/index.php?topic=isxfunc_charlength
-  i := 1;
-  while i <= Length(value) do
-  begin
-    c := value[i];
-    if c = #10 then begin
-      Result := Result + '\n';
-    end else if c = #13 then begin
-      Result := Result + '\r';
-    end else if c = #9 then begin
-      Result := Result + '\t';
-    end else if Ord(c) < 32 then begin
-      Result := Result + Format('\x%.4x', [Ord(c)]);
-    end else if c = '"' then begin
-      Result := Result + '\"';
-    end else if c = '\' then begin
-      Result := Result + '\\'
-    end else begin
-      Result := Result + c;
-    end;
-    i := i + CharLength(value, i);
-  end;
-end;
-
-// See https://stackoverflow.com/a/42550055/1086121
-
-procedure UpdateUninstallWizard;
-begin
-  if UninstallProgressForm.InnerNotebook.ActivePage = UninstallPollPage then
-  begin
-    UninstallProgressForm.PageNameLabel.Caption := 'Please Tell Us Why You''re Leaving';
-    UninstallProgressForm.PageDescriptionLabel.Caption := '';
-  end;
-
-  UninstallNextButton.Caption := 'Uninstall';
-  // Make the "Uninstall" button break the ShowModal loop
-  UninstallNextButton.ModalResult := mrOK;
-end;
-
-procedure InitializeUninstallProgressForm();
-var
-  PageText: TNewStaticText;
-  PageNameLabel: string;
-  PageDescriptionLabel: string;
-  CancelButtonEnabled: Boolean;
-  CancelButtonModalResult: Integer;
-  Checklist: TNewCheckListBox;
-  CommentsText: TNewStaticText;
-  CommentsBox: TNewMemo;
-  WinHttpReq: Variant;
-begin
-  if not UninstallSilent then
-  begin
-    // Create the poll page and make it active
-    UninstallPollPage := TNewNotebookPage.Create(UninstallProgressForm);
-    UninstallPollPage.Notebook := UninstallProgressForm.InnerNotebook;
-    UninstallPollPage.Parent := UninstallProgressForm.InnerNotebook;
-    UninstallPollPage.Align := alClient;
-
-    PageText := TNewStaticText.Create(UninstallProgressForm);
-    PageText.Parent := UninstallPollPage;
-    PageText.AutoSize := True;
-    PageText.WordWrap := True;
-    PageText.SetBounds(UninstallProgressForm.StatusLabel.Left, UninstallProgressForm.StatusLabel.Top, UninstallProgressForm.StatusLabel.Width, UninstallProgressForm.StatusLabel.Height);
-    PageText.ShowAccelChar := False;
-    PageText.Caption := 'Sorry you''re leaving! Please tell us what you didn''t like so we can improve it.' + #13#10 +
-    'No personal data will be sent. You can skip this step if you want.';
-
-    Checklist := TNewCheckListBox.Create(UninstallProgressForm);
-    Checklist.Parent := UninstallPollPage;
-    Checklist.SetBounds(PageText.Left, PageText.Top + PageText.Height + ScaleY(10), PageText.Width, ScaleY(20) * 5);
-    Checklist.BorderStyle := bsNone;
-    Checklist.Color := clBtnFace;
-    Checklist.WantTabs := True;
-    Checklist.MinItemHeight := ScaleY(20);
-
-    Checklist.AddCheckBox('I couldn''t get Syncthing to work', '', 0, False, True, False, False, nil);
-    Checklist.AddCheckBox('Syncthing doesn''t do what I need', '', 0, False, True, False, False, nil);
-    Checklist.AddCheckBox('I prefer another sync tool (please say which below)', '', 0, False, True, False, False, nil);
-    Checklist.AddCheckBox('I don''t like SyncTrayzor - I''m going to use another wrapper', '', 0, False, True, False, False, nil);
-    Checklist.AddCheckBox('Other (please expand below)', '', 0, False, True, False, False, nil);
-
-    CommentsText := TNewStaticText.Create(UninstallProgressForm);
-    CommentsText.Parent := UninstallPollPage;
-    CommentsText.AutoSize := True;
-    CommentsText.WordWrap := True;
-    CommentsText.SetBounds(PageText.Left, Checklist.Top + Checklist.Height + ScaleY(10), PageText.Width, ScaleY(15));
-    CommentsText.AutoSize := False;
-    CommentsText.ShowAccelChar := False;
-    CommentsText.Caption := 'More Details / Complaints:';
-
-    CommentsBox := TNewMemo.Create(UninstallProgressForm);
-    CommentsBox.Parent := UninstallPollPage;
-    CommentsBox.SetBounds(PageText.Left, CommentsText.Top + CommentsText.Height + ScaleY(5), PageText.Width, ScaleY(60));
-    CommentsBox.ScrollBars := ssVertical;
-
-    UninstallProgressForm.InnerNotebook.ActivePage := UninstallPollPage;
-
-    PageNameLabel := UninstallProgressForm.PageNameLabel.Caption;
-    PageDescriptionLabel := UninstallProgressForm.PageDescriptionLabel.Caption;
-
-    UninstallNextButton := TNewButton.Create(UninstallProgressForm);
-    UninstallNextButton.Parent := UninstallProgressForm;
-    UninstallNextButton.Left := UninstallProgressForm.CancelButton.Left - UninstallProgressForm.CancelButton.Width - ScaleX(10);
-    UninstallNextButton.Top := UninstallProgressForm.CancelButton.Top;
-    UninstallNextButton.Width := UninstallProgressForm.CancelButton.Width;
-    UninstallNextButton.Height := UninstallProgressForm.CancelButton.Height;
-
-    UninstallProgressForm.CancelButton.TabOrder := UninstallNextButton.TabOrder + 1;
-
-    // Run our wizard pages
-    UpdateUninstallWizard;
-    CancelButtonEnabled := UninstallProgressForm.CancelButton.Enabled
-    UninstallProgressForm.CancelButton.Enabled := True;
-    CancelButtonModalResult := UninstallProgressForm.CancelButton.ModalResult;
-    UninstallProgressForm.CancelButton.ModalResult := mrCancel;
-
-    if UninstallProgressForm.ShowModal = mrCancel then Abort;
-
-    if Checklist.Checked[0] or Checklist.Checked[1] or Checklist.Checked[2] or Checklist.Checked[3] or Checklist.Checked[4] or (CommentsBox.Text <> '') then begin
-      try
-      begin
-        WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1');
-        WinHttpReq.Open('POST', '{#SurveyUrl}', false);
-        WinHttpReq.Send('{' +
-          ' "version": "{#AppVersion}"' +
-          ', "comment": "' + EscapeJsonString(CommentsBox.Text) + '"' +
-          ', "checklist": {' +
-            ' "wontWork": '+ SerializeBool(Checklist.Checked[0]) + 
-            ', "notWhatINeed": '+ SerializeBool(Checklist.Checked[1]) +
-            ', "preferAnotherSyncTool": '+ SerializeBool(Checklist.Checked[2]) +
-            ', "dontLikeSyncTrayzor": '+ SerializeBool(Checklist.Checked[3]) +
-            ', "other": '+ SerializeBool(Checklist.Checked[4]) +
-          ' }' +
-          ' }');
-      end except
-      end;
-    end;
-
-    // Restore the standard page payout
-    UninstallProgressForm.CancelButton.Enabled := CancelButtonEnabled;
-    UninstallProgressForm.CancelButton.ModalResult := CancelButtonModalResult;
-
-    UninstallProgressForm.PageNameLabel.Caption := PageNameLabel;
-    UninstallProgressForm.PageDescriptionLabel.Caption := PageDescriptionLabel;
-
-    UninstallProgressForm.InnerNotebook.ActivePage := UninstallProgressForm.InstallingPage;
-  end;
-end;
-
 [UninstallDelete]
 Type: files; Name: "{app}\ProcessRunner.exe.old"
 Type: files; Name: "{app}\InstallCount.txt"
 Type: filesandordirs; Name: "{userappdata}\{#AppDataFolder}"
-Type: filesandordirs; Name: "{localappdata}\{#AppDataFolder}"
\ No newline at end of file
+Type: filesandordirs; Name: "{localappdata}\{#AppDataFolder}"
diff --git a/installer/dotNet451Setup.exe b/installer/dotNet451Setup.exe
deleted file mode 100644
index f2ddf0df..00000000
Binary files a/installer/dotNet451Setup.exe and /dev/null differ
diff --git a/installer/dotNet472Setup.exe b/installer/dotNet472Setup.exe
new file mode 100644
index 00000000..c7684d83
Binary files /dev/null and b/installer/dotNet472Setup.exe differ
diff --git a/server/version_check.php b/server/version_check.php
index 7d18d3a5..e011755f 100644
--- a/server/version_check.php
+++ b/server/version_check.php
@@ -65,7 +65,7 @@ function get_with_wildcard($src, $value, $default = null)
 }
 
 $versions = [
-   '1.1.24' => [
+   '1.1.25' => [
       'base_url' => 'https://github.com/canton7/SyncTrayzor/releases/download',
       'installed' => [
          'direct_download_url' => [
@@ -82,7 +82,7 @@ function get_with_wildcard($src, $value, $default = null)
       'sha1sum_download_url' => "{base_url}/v{version}/sha1sum.txt.asc",
       'sha512sum_download_url' => "{base_url}/v{version}/sha512sum.txt.asc",
       'release_page_url' => 'https://github.com/canton7/SyncTrayzor/releases/tag/v{version}',
-      'release_notes' => "- Fix issues caused by forward slashes in folder paths (#519, #520)",
+      'release_notes' => "- Add touch support\n- Minor UI updates (#538, #540, #541, #543)",
    ],
    '1.1.21' => [
       'base_url' => 'https://synctrayzor.antonymale.co.uk/download',
@@ -107,6 +107,8 @@ function get_with_wildcard($src, $value, $default = null)
 
 $upgrades = [
    // No point in upgrading from 1.1.23 for something so minor
+   '1.1.24' => ['to' => 'latest', 'formatter' => '5'],
+   '1.1.23' => ['to' => 'latest', 'formatter' => '5'],
    '1.1.22' => ['to' => 'latest', 'formatter' => '5'],
    '1.1.21' => ['to' => 'latest', 'formatter' => '5'],
    '1.1.20' => ['to' => 'latest', 'formatter' => '5'],
diff --git a/src/ChecksumUtil/App.config b/src/ChecksumUtil/App.config
index d0feca6f..ecdcf8a5 100644
--- a/src/ChecksumUtil/App.config
+++ b/src/ChecksumUtil/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
 </configuration>
diff --git a/src/ChecksumUtil/ChecksumUtil.csproj b/src/ChecksumUtil/ChecksumUtil.csproj
index 1b4b2c46..646d9662 100644
--- a/src/ChecksumUtil/ChecksumUtil.csproj
+++ b/src/ChecksumUtil/ChecksumUtil.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ChecksumUtil</RootNamespace>
     <AssemblyName>ChecksumUtil</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -33,10 +33,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
-      <HintPath>..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -57,7 +53,11 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BouncyCastle">
+      <Version>1.8.6.1</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/ChecksumUtil/packages.config b/src/ChecksumUtil/packages.config
deleted file mode 100644
index 730a601e..00000000
--- a/src/ChecksumUtil/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="BouncyCastle" version="1.8.1" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/src/PortableInstaller/App.config b/src/PortableInstaller/App.config
index d0feca6f..ecdcf8a5 100644
--- a/src/PortableInstaller/App.config
+++ b/src/PortableInstaller/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
 </configuration>
diff --git a/src/PortableInstaller/PortableInstaller.csproj b/src/PortableInstaller/PortableInstaller.csproj
index 4d797b5f..b3a026af 100644
--- a/src/PortableInstaller/PortableInstaller.csproj
+++ b/src/PortableInstaller/PortableInstaller.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PortableInstaller</RootNamespace>
     <AssemblyName>PortableInstaller</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
diff --git a/src/ProcessRunner/App.config b/src/ProcessRunner/App.config
index d0feca6f..ecdcf8a5 100644
--- a/src/ProcessRunner/App.config
+++ b/src/ProcessRunner/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
 </configuration>
diff --git a/src/ProcessRunner/ProcessRunner.csproj b/src/ProcessRunner/ProcessRunner.csproj
index d482dc0b..38bed930 100644
--- a/src/ProcessRunner/ProcessRunner.csproj
+++ b/src/ProcessRunner/ProcessRunner.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ProcessRunner</RootNamespace>
     <AssemblyName>ProcessRunner</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/src/SyncTrayzor/App.config b/src/SyncTrayzor/App.config
index 9a070e48..b57b684b 100644
--- a/src/SyncTrayzor/App.config
+++ b/src/SyncTrayzor/App.config
@@ -6,7 +6,7 @@
     </configSections>
   
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
     </startup>
 
     <system.net>
@@ -92,7 +92,31 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/SyncTrayzor/Bootstrapper.cs b/src/SyncTrayzor/Bootstrapper.cs
index 6508ab05..a69b7af1 100644
--- a/src/SyncTrayzor/Bootstrapper.cs
+++ b/src/SyncTrayzor/Bootstrapper.cs
@@ -39,6 +39,7 @@ protected override void ConfigureIoC(IStyletIoCBuilder builder)
         {
             builder.Bind<IApplicationState>().ToInstance(new ApplicationState(this.Application));
             builder.Bind<IApplicationWindowState>().To<ApplicationWindowState>().InSingletonScope();
+            builder.Bind<IFocusWindowProvider>().ToInstance(new FocusWindowProvider(this.Application));
             builder.Bind<IUserActivityMonitor>().To<UserActivityMonitor>().InSingletonScope();
             builder.Bind<IConfigurationProvider>().To<ConfigurationProvider>().InSingletonScope();
             builder.Bind<IApplicationPathsProvider>().To<ApplicationPathsProvider>().InSingletonScope();
diff --git a/src/SyncTrayzor/NotifyIcon/NotifyIconViewModel.cs b/src/SyncTrayzor/NotifyIcon/NotifyIconViewModel.cs
index 49929c49..1c7dbbc6 100644
--- a/src/SyncTrayzor/NotifyIcon/NotifyIconViewModel.cs
+++ b/src/SyncTrayzor/NotifyIcon/NotifyIconViewModel.cs
@@ -16,6 +16,7 @@ namespace SyncTrayzor.NotifyIcon
     public class NotifyIconViewModel : PropertyChangedBase, IDisposable
     {
         private readonly IWindowManager windowManager;
+        private readonly IFocusWindowProvider focusWindowProvider;
         private readonly ISyncthingManager syncthingManager;
         private readonly Func<SettingsViewModel> settingsViewModelFactory;
         private readonly IProcessStartProvider processStartProvider;
@@ -45,6 +46,7 @@ public class NotifyIconViewModel : PropertyChangedBase, IDisposable
 
         public NotifyIconViewModel(
             IWindowManager windowManager,
+            IFocusWindowProvider focusWindowProvider,
             ISyncthingManager syncthingManager,
             Func<SettingsViewModel> settingsViewModelFactory,
             IProcessStartProvider processStartProvider,
@@ -53,6 +55,7 @@ public NotifyIconViewModel(
             IConfigurationProvider configurationProvider)
         {
             this.windowManager = windowManager;
+            this.focusWindowProvider = focusWindowProvider;
             this.syncthingManager = syncthingManager;
             this.settingsViewModelFactory = settingsViewModelFactory;
             this.processStartProvider = processStartProvider;
@@ -126,8 +129,11 @@ public void DoubleClick()
 
         public void ShowSettings()
         {
-            var vm = this.settingsViewModelFactory();
-            this.windowManager.ShowDialog(vm);
+            if (!this.focusWindowProvider.TryFocus<SettingsViewModel>())
+            {
+                var vm = this.settingsViewModelFactory();
+                this.windowManager.ShowDialog(vm);
+            }
         }
 
         public void Restore()
diff --git a/src/SyncTrayzor/NotifyIcon/TaskbarIconResources.xaml b/src/SyncTrayzor/NotifyIcon/TaskbarIconResources.xaml
index 89ce6b70..7cd32a6a 100644
--- a/src/SyncTrayzor/NotifyIcon/TaskbarIconResources.xaml
+++ b/src/SyncTrayzor/NotifyIcon/TaskbarIconResources.xaml
@@ -5,7 +5,7 @@
                     xmlns:ni="clr-namespace:SyncTrayzor.NotifyIcon"
                     xmlns:tb="http://www.hardcodet.net/taskbar"
                     xmlns:xaml="clr-namespace:SyncTrayzor.Xaml"
-                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity">
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors">
 
     <BitmapImage x:Key="TaskbarStoppedIcon" UriSource="pack://application:,,,/Icons/stopped.ico"/>
     <BitmapImage x:Key="TaskbarAlertIcon" UriSource="pack://application:,,,/Icons/alert_tray.ico"/>
diff --git a/src/SyncTrayzor/Pages/ConflictResolution/ConflictResolutionView.xaml b/src/SyncTrayzor/Pages/ConflictResolution/ConflictResolutionView.xaml
index ab82240b..5afcb070 100644
--- a/src/SyncTrayzor/Pages/ConflictResolution/ConflictResolutionView.xaml
+++ b/src/SyncTrayzor/Pages/ConflictResolution/ConflictResolutionView.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SyncTrayzor.Pages.ConflictResolution"
         xmlns:s="https://github.com/canton7/Stylet"
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
         xmlns:xaml="clr-namespace:SyncTrayzor.Xaml"
         xmlns:l="clr-namespace:SyncTrayzor.Localization"
diff --git a/src/SyncTrayzor/Pages/ConsoleView.xaml b/src/SyncTrayzor/Pages/ConsoleView.xaml
index 259831e1..442ab1f4 100644
--- a/src/SyncTrayzor/Pages/ConsoleView.xaml
+++ b/src/SyncTrayzor/Pages/ConsoleView.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:l="clr-namespace:SyncTrayzor.Localization"
              mc:Ignorable="d" 
              xmlns:s="https://github.com/canton7/Stylet"
diff --git a/src/SyncTrayzor/Pages/Settings/SettingsView.xaml b/src/SyncTrayzor/Pages/Settings/SettingsView.xaml
index b762f381..9dd2c4f0 100644
--- a/src/SyncTrayzor/Pages/Settings/SettingsView.xaml
+++ b/src/SyncTrayzor/Pages/Settings/SettingsView.xaml
@@ -4,7 +4,7 @@
         xmlns:s="https://github.com/canton7/Stylet"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:settings="clr-namespace:SyncTrayzor.Pages.Settings"
         xmlns:xaml="clr-namespace:SyncTrayzor.Xaml"
         xmlns:l="clr-namespace:SyncTrayzor.Localization"
@@ -21,6 +21,15 @@
     </i:Interaction.Behaviors>
     <Window.Resources>
         <s:BoolToVisibilityConverter x:Key="InverseVisibilityConverter" TrueVisibility="Collapsed" FalseVisibility="Visible"/>
+        <Style TargetType="CheckBox">
+            <Setter Property="ContentTemplate">
+                <Setter.Value>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding}" TextWrapping="WrapWithOverflow"/>
+                    </DataTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>   
     </Window.Resources>
     <DockPanel Margin="0,10">
         <StackPanel DockPanel.Dock="Bottom" Margin="0,10,10,0" Orientation="Horizontal" HorizontalAlignment="Right">
@@ -43,6 +52,7 @@
                     <DockPanel>
                         <GroupBox DockPanel.Dock="Top" Header="{l:Loc SettingsView_Section_SyncTrayzor}">
                             <DockPanel>
+                                <CheckBox DockPanel.Dock="Top" Content="WOo yay this is a really long string and it isn't wrapping nooo make it even longer go on I dare you"/>
                                 <CheckBox DockPanel.Dock="Top" IsChecked="{Binding MinimizeToTray.Value}" Content="{l:Loc SettingsView_MinimizeToTray}"/>
                                 <CheckBox DockPanel.Dock="Top" IsChecked="{Binding CloseToTray.Value}" Content="{l:Loc SettingsView_CloseToTray}"/>
                                 <CheckBox DockPanel.Dock="Top" IsChecked="{Binding NotifyOfNewVersions.Value}" Content="{l:Loc SettingsView_AlertOnNewVersion}"/>
@@ -59,9 +69,8 @@
                                 <CheckBox DockPanel.Dock="Top" IsChecked="{Binding ShowTrayIconOnlyOnClose.Value}" Content="{l:Loc SettingsView_OnlyShowTrayIconOnClose}"/>
                                 <Grid DockPanel.Dock="Top">
                                     <CheckBox IsChecked="{Binding ShowSynchronizedBalloonEvenIfNothingDownloaded.Value}"
-                                                Width="{Binding Parent.ActualWidth, RelativeSource={RelativeSource Self}}">
-                                        <TextBlock Text="{l:Loc SettingsView_ShowSynchronizedBalloonIfNoFilesTransferred}" TextWrapping="WrapWithOverflow"/>
-                                    </CheckBox>
+                                              Width="{Binding Parent.ActualWidth, RelativeSource={RelativeSource Self}}"
+                                              Content="{l:Loc SettingsView_ShowSynchronizedBalloonIfNoFilesTransferred}"/>
                                 </Grid>
                                 <CheckBox DockPanel.Dock="Top" IsChecked="{Binding ShowDeviceConnectivityBalloons.Value}" Content="{l:Loc SettingsView_ShowDeviceConnectivityBalloons}"/>
                                 <CheckBox DockPanel.Dock="Top" IsChecked="{Binding ShowDeviceOrFolderRejectedBalloons.Value}" Content="{l:Loc SettingsView_ShowDeviceOrFolderRejectedBalloons}"/>
diff --git a/src/SyncTrayzor/Pages/Settings/SyncthingCommandLineFlagsValidator.cs b/src/SyncTrayzor/Pages/Settings/SyncthingCommandLineFlagsValidator.cs
index d112c0df..4c639ade 100644
--- a/src/SyncTrayzor/Pages/Settings/SyncthingCommandLineFlagsValidator.cs
+++ b/src/SyncTrayzor/Pages/Settings/SyncthingCommandLineFlagsValidator.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using FluentValidation;
-using FluentValidation.Results;
 using SyncTrayzor.Localization;
 using SyncTrayzor.Properties;
 
@@ -25,17 +24,16 @@ private class IndividualFlagsValidator : AbstractValidator<string>
         {
             public IndividualFlagsValidator()
             {
-                Custom(str =>
+                this.RuleFor(x => x).Custom((str, ctx) =>
                 {
                     KeyValueStringParser.TryParse(str, out var result, mustHaveValue: false);
 
                     if (!result.All(flag => flag.Key.StartsWith("-")))
-                        return new ValidationFailure(null, Resources.SettingsView_Validation_SyncthingCommandLineFlagsMustBeginWithHyphen);
+                        ctx.AddFailure(Resources.SettingsView_Validation_SyncthingCommandLineFlagsMustBeginWithHyphen);
 
                     var firstFailure = result.Select(flag => flag.Key).FirstOrDefault(key => forbiddenArgs.Contains(key));
                     if (firstFailure != null)
-                        return new ValidationFailure(null, Localizer.F(Resources.SettingsView_Validation_SyncthingCommandLineFlagIsNotAllowed, firstFailure));
-                    return null;
+                        ctx.AddFailure(Localizer.F(Resources.SettingsView_Validation_SyncthingCommandLineFlagIsNotAllowed, firstFailure));
                 });
             }
         }
diff --git a/src/SyncTrayzor/Pages/ShellView.xaml b/src/SyncTrayzor/Pages/ShellView.xaml
index cf524344..2e0e852c 100644
--- a/src/SyncTrayzor/Pages/ShellView.xaml
+++ b/src/SyncTrayzor/Pages/ShellView.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:s="https://github.com/canton7/Stylet"
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:xaml="clr-namespace:SyncTrayzor.Xaml"
         xmlns:l="clr-namespace:SyncTrayzor.Localization"
         FlowDirection="{x:Static l:Localizer.FlowDirection}"
diff --git a/src/SyncTrayzor/Pages/Tray/FileTransfersTrayView.xaml b/src/SyncTrayzor/Pages/Tray/FileTransfersTrayView.xaml
index 3a74d015..9daf208a 100644
--- a/src/SyncTrayzor/Pages/Tray/FileTransfersTrayView.xaml
+++ b/src/SyncTrayzor/Pages/Tray/FileTransfersTrayView.xaml
@@ -6,7 +6,7 @@
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:l="clr-namespace:SyncTrayzor.Localization"
              xmlns:xaml="clr-namespace:SyncTrayzor.Xaml"
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              mc:Ignorable="d" 
              x:Name="RootObject"
              Height="350"
diff --git a/src/SyncTrayzor/Pages/ViewerViewModel.cs b/src/SyncTrayzor/Pages/ViewerViewModel.cs
index 969fb782..f6137c4a 100644
--- a/src/SyncTrayzor/Pages/ViewerViewModel.cs
+++ b/src/SyncTrayzor/Pages/ViewerViewModel.cs
@@ -11,10 +11,11 @@
 using SyncTrayzor.Properties;
 
 using Microsoft.WindowsAPICodePack.Dialogs;
+using CefSharp.Handler;
 
 namespace SyncTrayzor.Pages
 {
-    public class ViewerViewModel : Screen, IRequestHandler, ILifeSpanHandler, IContextMenuHandler, IDisposable
+    public class ViewerViewModel : Screen, IResourceRequestHandlerFactory, ILifeSpanHandler, IContextMenuHandler, IDisposable
     {
         private readonly IWindowManager windowManager;
         private readonly ISyncthingManager syncthingManager;
@@ -22,6 +23,8 @@ public class ViewerViewModel : Screen, IRequestHandler, ILifeSpanHandler, IConte
         private readonly IConfigurationProvider configurationProvider;
         private readonly IApplicationPathsProvider pathsProvider;
 
+        private readonly CustomResourceRequestHandler customResourceRequestHandler;
+
         private readonly object cultureLock = new object(); // This can be read from many threads
         private CultureInfo culture;
         private double zoomLevel;
@@ -61,8 +64,9 @@ public ViewerViewModel(
             this.zoomLevel = configuration.SyncthingWebBrowserZoomLevel;
 
             this.syncthingManager.StateChanged += this.SyncthingStateChanged;
-
-            this.callback = new JavascriptCallbackObject(this.OpenFolder, this.BrowseFolderPath);
+            
+            this.customResourceRequestHandler = new CustomResourceRequestHandler(this);
+            this.callback = new JavascriptCallbackObject(this);
 
             this.SetCulture(configuration);
             configurationProvider.ConfigurationChanged += this.ConfigurationChanged;
@@ -124,12 +128,11 @@ protected override void OnInitialActivate()
 
         private void InitializeBrowser(ChromiumWebBrowser webBrowser)
         {
-            webBrowser.RequestHandler = this;
+            webBrowser.ResourceRequestHandlerFactory = this;
             webBrowser.LifeSpanHandler = this;
             webBrowser.MenuHandler = this;
-            // Don't enable touch scrolling yet - it's still buggy, and causes tapping on links to fail
-            //webBrowser.IsManipulationEnabled = true;
-            webBrowser.RegisterJsObject("callbackObject", this.callback);
+            webBrowser.JavascriptObjectRepository.Settings.LegacyBindingEnabled = true;
+            webBrowser.JavascriptObjectRepository.Register("callbackObject", this.callback, isAsync: true);
 
             // So. Fun story. From https://github.com/cefsharp/CefSharp/issues/738#issuecomment-91099199, we need to set the zoom level
             // in the FrameLoadStart event. However, the IWpfWebBrowser's ZoomLevel is a DependencyProperty, and it wraps
@@ -317,17 +320,14 @@ private Uri GetSyncthingAddress()
             return uriBuilder.Uri;
         }
 
-        bool IRequestHandler.GetAuthCredentials(IWebBrowser browserControl, IBrowser browser, IFrame frame, bool isProxy, string host, int port, string realm, string scheme, IAuthCallback callback)
-        {
-            return false;
-        }
+        bool IResourceRequestHandlerFactory.HasHandlers => true;
 
-        bool IRequestHandler.OnBeforeBrowse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, bool isRedirect)
+        IResourceRequestHandler IResourceRequestHandlerFactory.GetResourceRequestHandler(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool isNavigation, bool isDownload, string requestInitiator, ref bool disableDefaultHandling)
         {
-            return false;
+            return this.customResourceRequestHandler;
         }
 
-        CefReturnValue IRequestHandler.OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback)
+        private CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback)
         {
             var uri = new Uri(request.Url);
             // We can get http requests just after changing Syncthing's address: after we've navigated to about:blank but before navigating to
@@ -359,58 +359,6 @@ CefReturnValue IRequestHandler.OnBeforeResourceLoad(IWebBrowser browserControl,
             return CefReturnValue.Continue;
         }
 
-        bool IRequestHandler.OnCertificateError(IWebBrowser browserControl, IBrowser browser, CefErrorCode errorCode, string requestUrl, ISslInfo sslInfo, IRequestCallback callback)
-        {
-            // We shouldn't hit this, since IgnoreCertificateErrors is true
-            return true;
-        }
-
-        void IRequestHandler.OnPluginCrashed(IWebBrowser browserControl, IBrowser browser, string pluginPath)
-        {
-        }
-
-        void IRequestHandler.OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status)
-        {
-        }
-
-        bool IRequestHandler.OnOpenUrlFromTab(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, WindowOpenDisposition targetDisposition, bool userGesture)
-        {
-            return false;
-        }
-
-        bool IRequestHandler.OnQuotaRequest(IWebBrowser browserControl, IBrowser browser, string originUrl, long newSize, IRequestCallback callback)
-        {
-            callback.Continue(true);
-            return true;
-        }
-
-        void IRequestHandler.OnResourceRedirect(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, ref string newUrl)
-        {
-        }
-
-        bool IRequestHandler.OnProtocolExecution(IWebBrowser browserControl, IBrowser browser, string url)
-        {
-            return false;
-        }
-
-        void IRequestHandler.OnRenderViewReady(IWebBrowser browserControl, IBrowser browser)
-        {
-        }
-
-        bool IRequestHandler.OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response)
-        {
-            return false;
-        }
-
-        IResponseFilter IRequestHandler.GetResourceResponseFilter(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response)
-        {
-            return null;
-        }
-
-        void IRequestHandler.OnResourceLoadComplete(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response, UrlRequestStatus status, long receivedContentLength)
-        {
-        }
-
         void ILifeSpanHandler.OnBeforeClose(IWebBrowser browserControl, IBrowser browser)
         {
         }
@@ -457,25 +405,38 @@ public void Dispose()
             this.configurationProvider.ConfigurationChanged -= this.ConfigurationChanged;
         }
 
+        private class CustomResourceRequestHandler : ResourceRequestHandler
+        {
+            private readonly ViewerViewModel parent;
+
+            public CustomResourceRequestHandler(ViewerViewModel parent)
+            {
+                this.parent = parent;
+            }
+
+            protected override CefReturnValue OnBeforeResourceLoad(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback)
+            {
+                return this.parent.OnBeforeResourceLoad(chromiumWebBrowser, browser, frame, request, callback);
+            }
+        }
+
         private class JavascriptCallbackObject
         {
-            private readonly Action<string> openFolderAction;
-            private readonly Action browseFolderPathAction;
+            private readonly ViewerViewModel parent;
 
-            public JavascriptCallbackObject(Action<string> openFolderAction, Action browseFolderPathAction)
+            public JavascriptCallbackObject(ViewerViewModel parent)
             {
-                this.openFolderAction = openFolderAction;
-                this.browseFolderPathAction = browseFolderPathAction;
+                this.parent = parent;
             }
 
             public void OpenFolder(string folderId)
             {
-                this.openFolderAction(folderId);
+                this.parent.OpenFolder(folderId);
             }
 
             public void BrowseFolderPath()
             {
-                this.browseFolderPathAction();
+                this.parent.BrowseFolderPath();
             }
         }
     }
diff --git a/src/SyncTrayzor/Properties/Resources.Designer.cs b/src/SyncTrayzor/Properties/Resources.Designer.cs
index 9619b91d..62a5b1dc 100644
--- a/src/SyncTrayzor/Properties/Resources.Designer.cs
+++ b/src/SyncTrayzor/Properties/Resources.Designer.cs
@@ -657,7 +657,7 @@ public static string FileTransfersTrayView_InConnectionRate {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to No recent file transfers.
+        ///   Looks up a localized string similar to No recent file downloads.
         /// </summary>
         public static string FileTransfersTrayView_NothingToShow {
             get {
diff --git a/src/SyncTrayzor/Properties/Resources.resx b/src/SyncTrayzor/Properties/Resources.resx
index d00749de..415b6c18 100644
--- a/src/SyncTrayzor/Properties/Resources.resx
+++ b/src/SyncTrayzor/Properties/Resources.resx
@@ -573,7 +573,7 @@ SyncTrayzor is going to have to close. Sorry about that</value>
     <comment>{0}: a value such as '1.2kb'</comment>
   </data>
   <data name="FileTransfersTrayView_NothingToShow" xml:space="preserve">
-    <value>No recent file transfers</value>
+    <value>No recent file downloads</value>
   </data>
   <data name="FileTransfersTrayView_OutConnectionRate" xml:space="preserve">
     <value>Out: {0}/s</value>
diff --git a/src/SyncTrayzor/Services/ConfigurationApplicator.cs b/src/SyncTrayzor/Services/ConfigurationApplicator.cs
index b5410515..afc69a0e 100644
--- a/src/SyncTrayzor/Services/ConfigurationApplicator.cs
+++ b/src/SyncTrayzor/Services/ConfigurationApplicator.cs
@@ -157,8 +157,8 @@ private void LoadFolders(Configuration configuration)
             var folderIds = this.syncthingManager.Folders.FetchAll().Select(x => x.FolderId).ToList();
 
             // If all folders are not watched, new folders are not watched too. Likewise notifications.
-            // If there are no folders, then enable
-            bool areAnyWatched = configuration.Folders.Count == 0 || configuration.Folders.Any(x => x.IsWatched);
+            // If there are no folders, then enable (notifications only)
+            bool areAnyWatched = configuration.Folders.Any(x => x.IsWatched);
             bool areAnyNotifications = configuration.Folders.Count == 0 || configuration.Folders.Any(x => x.NotificationsEnabled);
 
             foreach (var newKey in folderIds.Except(configuration.Folders.Select(x => x.ID)))
diff --git a/src/SyncTrayzor/Services/FocusWindowProvider.cs b/src/SyncTrayzor/Services/FocusWindowProvider.cs
new file mode 100644
index 00000000..70295d0f
--- /dev/null
+++ b/src/SyncTrayzor/Services/FocusWindowProvider.cs
@@ -0,0 +1,31 @@
+using System.Linq;
+using System.Windows;
+
+namespace SyncTrayzor.Services
+{
+    public interface IFocusWindowProvider
+    {
+        bool TryFocus<TViewModel>();
+    }
+
+    public class FocusWindowProvider : IFocusWindowProvider
+    {
+        private readonly Application application;
+
+        public FocusWindowProvider(Application application)
+        {
+            this.application = application;
+        }
+
+        public bool TryFocus<TViewModel>()
+        {
+            var window = this.application.Windows.OfType<Window>().FirstOrDefault(x => x.DataContext is TViewModel);
+            if (window != null)
+            {
+                window.Focus();
+                return true;
+            }
+            return false;
+        }
+    }
+}
diff --git a/src/SyncTrayzor/Services/UpdateManagement/UpdateManager.cs b/src/SyncTrayzor/Services/UpdateManagement/UpdateManager.cs
index 8bbf751d..b50e0ccc 100644
--- a/src/SyncTrayzor/Services/UpdateManagement/UpdateManager.cs
+++ b/src/SyncTrayzor/Services/UpdateManagement/UpdateManager.cs
@@ -34,12 +34,12 @@ public class UpdateManager : IUpdateManager
 
         private static readonly TimeSpan deadTimeAfterStarting = TimeSpan.FromMinutes(5);
         // We'll never check more frequently than this, ever
-        private static readonly TimeSpan updateCheckDebounceTime = TimeSpan.FromHours(1);
+        private static readonly TimeSpan updateCheckDebounceTime = TimeSpan.FromHours(24);
         // If 'remind me later' is active, we'll check this frequently
-        private static readonly TimeSpan remindMeLaterTime = TimeSpan.FromDays(3);
+        private static readonly TimeSpan remindMeLaterTime = TimeSpan.FromDays(7);
         // How often the update checking timer should fire. Having it fire too often is OK: we won't
         // take action
-        private static readonly TimeSpan updateCheckingTimerInterval = TimeSpan.FromHours(8);
+        private static readonly TimeSpan updateCheckingTimerInterval = TimeSpan.FromDays(5);
 
         private readonly IApplicationState applicationState;
         private readonly IApplicationWindowState applicationWindowState;
diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index d464cee6..39dd5087 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\CefSharp.Wpf.49.0.0\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.49.0.0\build\CefSharp.Wpf.props')" />
-  <Import Project="..\packages\CefSharp.Common.49.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.49.0.0\build\CefSharp.Common.props')" />
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SyncTrayzor</RootNamespace>
     <AssemblyName>SyncTrayzor</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -82,18 +80,6 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
-      <HintPath>..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentValidation, Version=6.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Hardcodet.Wpf.TaskbarNotification, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Interop.NETWORKLIST">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -102,81 +88,26 @@
     <Reference Include="Itenso.Windows.Controls.ListViewLayout">
       <HintPath>..\..\lib\Itenso.Windows.Controls.ListViewLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.2\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
-      <HintPath>..\packages\OxyPlot.Core.1.0.0\lib\net45\OxyPlot.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="OxyPlot.Wpf, Version=1.0.0.0, Culture=neutral, PublicKeyToken=75e952ba404cdbb0, processorArchitecture=MSIL">
-      <HintPath>..\packages\OxyPlot.Wpf.1.0.0\lib\net45\OxyPlot.Wpf.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="PresentationFramework" />
     <Reference Include="PresentationFramework.Aero" />
-    <Reference Include="Pri.LongPath, Version=2.0.42.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Pri.LongPath.2.0.42\lib\net45\Pri.LongPath.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="PropertyChanged, Version=1.52.1.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
-      <HintPath>..\packages\PropertyChanged.Fody.1.52.1\lib\netstandard10\PropertyChanged.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="RestEase, Version=1.4.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestEase.1.4.3\lib\net45\RestEase.dll</HintPath>
-    </Reference>
-    <Reference Include="SmartFormat, Version=2.0.0.0, Culture=neutral, PublicKeyToken=568866805651201f, processorArchitecture=MSIL">
-      <HintPath>..\packages\SmartFormat.NET.2.0.0.0\lib\net45\SmartFormat.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Stylet, Version=1.1.19.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Stylet.1.1.19\lib\net45\Stylet.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <Reference Include="ReachFramework" />
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
-    <Reference Include="System.Reactive.Core, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Linq, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.PlatformServices.3.1.1\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Windows.Threading, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Printing" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
     <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -248,6 +179,7 @@
     <Compile Include="Services\DonationManager.cs" />
     <Compile Include="Services\FilesystemProvider.cs" />
     <Compile Include="Services\FileWatcher.cs" />
+    <Compile Include="Services\FocusWindowProvider.cs" />
     <Compile Include="Services\Ipc\IpcCommsClient.cs" />
     <Compile Include="Services\Ipc\IpcCommsClientFactory.cs" />
     <Compile Include="Services\Ipc\IpcCommsServer.cs" />
@@ -427,7 +359,6 @@
     <EmbeddedResource Include="..\..\security\synctrayzor_releases_cert.asc">
       <Link>Resources\synctrayzor_releases_cert.asc</Link>
     </EmbeddedResource>
-    <None Include="packages.config" />
     <AppDesigner Include="Properties\" />
     <None Include="SyncTrayzor.ruleset" />
   </ItemGroup>
@@ -627,6 +558,75 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\Licenses\OxyPlot.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BouncyCastle">
+      <Version>1.8.6.1</Version>
+    </PackageReference>
+    <PackageReference Include="CefSharp.Wpf">
+      <Version>86.0.241</Version>
+    </PackageReference>
+    <PackageReference Include="FluentValidation">
+      <Version>9.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="Fody">
+      <Version>1.29.4</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Hardcodet.NotifyIcon.Wpf">
+      <Version>1.0.8</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
+      <Version>1.1.19</Version>
+    </PackageReference>
+    <PackageReference Include="NLog">
+      <Version>4.7.6</Version>
+    </PackageReference>
+    <PackageReference Include="OxyPlot.Wpf">
+      <Version>2.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Pri.LongPath">
+      <Version>2.0.53</Version>
+    </PackageReference>
+    <PackageReference Include="PropertyChanged.Fody">
+      <Version>1.52.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="RestEase">
+      <Version>1.5.2</Version>
+    </PackageReference>
+    <PackageReference Include="SmartFormat.NET">
+      <Version>2.5.3</Version>
+    </PackageReference>
+    <PackageReference Include="Stylet">
+      <Version>1.3.5</Version>
+    </PackageReference>
+    <PackageReference Include="System.Reactive.Core">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Reactive.Interfaces">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Reactive.Linq">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Reactive.PlatformServices">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Reactive.Windows.Threading">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Text.Json">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="WindowsAPICodePack-Core">
+      <Version>1.1.2</Version>
+    </PackageReference>
+    <PackageReference Include="WindowsAPICodePack-Shell">
+      <Version>1.1.1</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="Configs">
     <XslTransformation XmlInputPaths="App.config" XslInputPath="App.Installer.config.xslt" OutputPaths="$(OutputPath)$(RootNamespace).exe.Installer.config" />
@@ -638,19 +638,4 @@
   <Target Name="AfterBuild">
     <CallTarget Targets="Configs" />
   </Target>
-  <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\cef.redist.x64.3.2623.1396\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.3.2623.1396\build\cef.redist.x64.targets'))" />
-    <Error Condition="!Exists('..\packages\cef.redist.x86.3.2623.1396\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.3.2623.1396\build\cef.redist.x86.targets'))" />
-    <Error Condition="!Exists('..\packages\CefSharp.Common.49.0.0\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.49.0.0\build\CefSharp.Common.props'))" />
-    <Error Condition="!Exists('..\packages\CefSharp.Common.49.0.0\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.49.0.0\build\CefSharp.Common.targets'))" />
-    <Error Condition="!Exists('..\packages\CefSharp.Wpf.49.0.0\build\CefSharp.Wpf.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Wpf.49.0.0\build\CefSharp.Wpf.props'))" />
-    <Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
-  </Target>
-  <Import Project="..\packages\cef.redist.x64.3.2623.1396\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2623.1396\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.2623.1396\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2623.1396\build\cef.redist.x86.targets')" />
-  <Import Project="..\packages\CefSharp.Common.49.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.49.0.0\build\CefSharp.Common.targets')" />
-  <Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/SyncTrayzor/Utils/FluentModelValidator.cs b/src/SyncTrayzor/Utils/FluentModelValidator.cs
index b219a3e2..99172872 100644
--- a/src/SyncTrayzor/Utils/FluentModelValidator.cs
+++ b/src/SyncTrayzor/Utils/FluentModelValidator.cs
@@ -25,8 +25,9 @@ public async Task<IEnumerable<string>> ValidatePropertyAsync(string propertyName
         {
             // If someone's calling us synchronously, and ValidationAsync does not complete synchronously,
             // we'll deadlock unless we continue on another thread.
-            return (await this.validator.ValidateAsync(this.subject, propertyName).ConfigureAwait(false))
-                .Errors.Select(x => x.ErrorMessage);
+            var result = await this.validator.ValidateAsync(this.subject, options => options.IncludeProperties(propertyName))
+                .ConfigureAwait(false);
+            return result.Errors.Select(x => x.ErrorMessage);
         }
 
         public async Task<Dictionary<string, IEnumerable<string>>> ValidateAllPropertiesAsync()
diff --git a/src/SyncTrayzor/Xaml/CollapsingRowDefinitionBehaviour.cs b/src/SyncTrayzor/Xaml/CollapsingRowDefinitionBehaviour.cs
index 95d333d1..b12a9357 100644
--- a/src/SyncTrayzor/Xaml/CollapsingRowDefinitionBehaviour.cs
+++ b/src/SyncTrayzor/Xaml/CollapsingRowDefinitionBehaviour.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 namespace SyncTrayzor.Xaml
 {
diff --git a/src/SyncTrayzor/Xaml/DetachingBehaviour.cs b/src/SyncTrayzor/Xaml/DetachingBehaviour.cs
index 3c8f99c9..30c0bc38 100644
--- a/src/SyncTrayzor/Xaml/DetachingBehaviour.cs
+++ b/src/SyncTrayzor/Xaml/DetachingBehaviour.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Windows;
 using System.Windows.Data;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 namespace SyncTrayzor.Xaml
 {
diff --git a/src/SyncTrayzor/packages.config b/src/SyncTrayzor/packages.config
deleted file mode 100644
index 9cfc4977..00000000
--- a/src/SyncTrayzor/packages.config
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="BouncyCastle" version="1.8.1" targetFramework="net451" />
-  <package id="cef.redist.x64" version="3.2623.1396" targetFramework="net451" />
-  <package id="cef.redist.x86" version="3.2623.1396" targetFramework="net451" />
-  <package id="CefSharp.Common" version="49.0.0" targetFramework="net451" />
-  <package id="CefSharp.Wpf" version="49.0.0" targetFramework="net451" />
-  <package id="FluentValidation" version="6.2.1.0" targetFramework="net451" />
-  <package id="Fody" version="1.29.4" targetFramework="net451" developmentDependency="true" />
-  <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net451" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
-  <package id="NLog" version="4.4.2" targetFramework="net451" />
-  <package id="OxyPlot.Core" version="1.0.0" targetFramework="net451" />
-  <package id="OxyPlot.Wpf" version="1.0.0" targetFramework="net451" />
-  <package id="Pri.LongPath" version="2.0.42" targetFramework="net451" />
-  <package id="PropertyChanged.Fody" version="1.52.1" targetFramework="net451" developmentDependency="true" />
-  <package id="RestEase" version="1.4.3" targetFramework="net451" />
-  <package id="SmartFormat.NET" version="2.0.0.0" targetFramework="net451" />
-  <package id="Stylet" version="1.1.19" targetFramework="net451" />
-  <package id="System.Reactive" version="3.1.1" targetFramework="net451" />
-  <package id="System.Reactive.Core" version="3.1.1" targetFramework="net451" />
-  <package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net451" />
-  <package id="System.Reactive.Linq" version="3.1.1" targetFramework="net451" />
-  <package id="System.Reactive.PlatformServices" version="3.1.1" targetFramework="net451" />
-  <package id="System.Reactive.Windows.Threading" version="3.1.1" targetFramework="net451" />
-  <package id="System.ValueTuple" version="4.3.0" targetFramework="net451" />
-  <package id="WindowsAPICodePack-Core" version="1.1.2" targetFramework="net451" />
-  <package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net451" />
-</packages>
\ No newline at end of file