diff --git a/Qiqqa.sln b/Qiqqa.sln
index 7a6c35b6e..c81c0493a 100644
--- a/Qiqqa.sln
+++ b/Qiqqa.sln
@@ -408,8 +408,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OCR Toolchain Demo", "Techn
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "D3 Visualization With Qiqqa Web Server Demo", "Technology.Tests\D3 Visualization With Qiqqa Web Server Demo\D3 Visualization With Qiqqa Web Server Demo.csproj", "{27CE9293-3BA0-4CE6-8BFD-396EE0353791}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bulk PDF Inspection Tool", "Technology.Tests\Bulk PDF Inspection Tool\Bulk PDF Inspection Tool.csproj", "{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Async All The Way Demo", "Technology.Tests\Async All The Way Demo\Async All The Way Demo.csproj", "{806015D1-83C3-4DF4-B6F0-8674FECE51A3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MuPDF subprojects", "MuPDF subprojects", "{A641717E-DD60-4E51-9973-D57D1CDAFB69}"
@@ -2166,88 +2164,6 @@ Global
 		{27CE9293-3BA0-4CE6-8BFD-396EE0353791}.Release+SETUP|x64.Build.0 = Release|Any CPU
 		{27CE9293-3BA0-4CE6-8BFD-396EE0353791}.Release+SETUP|x86.ActiveCfg = Release|Any CPU
 		{27CE9293-3BA0-4CE6-8BFD-396EE0353791}.Release+SETUP|x86.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Debug|ARM.Build.0 = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Debug|x64.Build.0 = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Debug|x86.Build.0 = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Debug|ARM.ActiveCfg = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Debug|ARM.Build.0 = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Debug|ARM64.Build.0 = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Debug|x64.ActiveCfg = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Debug|x64.Build.0 = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Debug|x86.ActiveCfg = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Debug|x86.Build.0 = Debug|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Release|Any CPU.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Release|ARM.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Release|ARM.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Release|ARM64.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Release|ARM64.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Release|x64.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Release|x64.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Release|x86.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.DLL-Import Release|x86.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 2.0|Any CPU.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 2.0|Any CPU.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 2.0|ARM.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 2.0|ARM.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 2.0|ARM64.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 2.0|ARM64.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 2.0|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 2.0|Mixed Platforms.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 2.0|x64.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 2.0|x64.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 2.0|x86.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 2.0|x86.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 4.5|Any CPU.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 4.5|Any CPU.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 4.5|ARM.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 4.5|ARM.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 4.5|ARM64.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 4.5|ARM64.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 4.5|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 4.5|Mixed Platforms.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 4.5|x64.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 4.5|x64.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 4.5|x86.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release 4.5|x86.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release|ARM.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release|ARM.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release|ARM64.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release|x64.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release|x64.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release|x86.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release|x86.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release+SETUP|Any CPU.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release+SETUP|Any CPU.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release+SETUP|ARM.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release+SETUP|ARM64.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release+SETUP|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release+SETUP|Mixed Platforms.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release+SETUP|x64.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release+SETUP|x64.Build.0 = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release+SETUP|x86.ActiveCfg = Release|Any CPU
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8}.Release+SETUP|x86.Build.0 = Release|Any CPU
 		{806015D1-83C3-4DF4-B6F0-8674FECE51A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{806015D1-83C3-4DF4-B6F0-8674FECE51A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{806015D1-83C3-4DF4-B6F0-8674FECE51A3}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -3460,7 +3376,6 @@ Global
 		{7D895C92-95FF-4489-AC8B-5652BF1873F9} = {E36F5BCC-074B-48E3-AB29-26E1D21A3FBB}
 		{4B176B4A-0169-492B-9F4F-A7F9958DC5F0} = {E36F5BCC-074B-48E3-AB29-26E1D21A3FBB}
 		{27CE9293-3BA0-4CE6-8BFD-396EE0353791} = {E36F5BCC-074B-48E3-AB29-26E1D21A3FBB}
-		{81EB0FCD-2A16-4046-B6D5-FDE3B1543BD8} = {E36F5BCC-074B-48E3-AB29-26E1D21A3FBB}
 		{806015D1-83C3-4DF4-B6F0-8674FECE51A3} = {E36F5BCC-074B-48E3-AB29-26E1D21A3FBB}
 		{36D059A6-9D80-4733-B8CE-96806B0C3EAE} = {73518069-A3E0-4E0B-A25E-DF8F23361E88}
 		{5B1B4CEC-D634-4D8C-A282-396EF5025838} = {73518069-A3E0-4E0B-A25E-DF8F23361E88}
@@ -3491,7 +3406,6 @@ Global
 		Technology.Tests\Shared CSharp\Shared CSharp.projitems*{4b176b4a-0169-492b-9f4f-a7f9958dc5f0}*SharedItemsImports = 4
 		Technology.Tests\Shared CSharp\Shared CSharp.projitems*{7d895c92-95ff-4489-ac8b-5652bf1873f9}*SharedItemsImports = 4
 		Technology.Tests\Shared CSharp\Shared CSharp.projitems*{806015d1-83c3-4df4-b6f0-8674fece51a3}*SharedItemsImports = 4
-		Technology.Tests\Shared CSharp\Shared CSharp.projitems*{81eb0fcd-2a16-4046-b6d5-fde3b1543bd8}*SharedItemsImports = 4
 		Technology.Tests\Shared CSharp\Shared CSharp.projitems*{959e52dd-e073-4bb9-8437-ab2400bbbd22}*SharedItemsImports = 4
 		Technology.Tests\Shared C++\Shared C++.vcxitems*{9c9a7d0c-7241-4543-ac47-357f3520353e}*SharedItemsImports = 4
 		Technology.Tests\Shared C++\Shared C++.vcxitems*{b24a8d63-228a-4459-8786-3d5c3c70d52c}*SharedItemsImports = 9
diff --git a/Qiqqa/DocumentLibrary/LibraryCatalog/MultipleDocumentsSelectedPanel.xaml.cs b/Qiqqa/DocumentLibrary/LibraryCatalog/MultipleDocumentsSelectedPanel.xaml.cs
index 10ca0f22f..cc9eec21c 100644
--- a/Qiqqa/DocumentLibrary/LibraryCatalog/MultipleDocumentsSelectedPanel.xaml.cs
+++ b/Qiqqa/DocumentLibrary/LibraryCatalog/MultipleDocumentsSelectedPanel.xaml.cs
@@ -178,6 +178,10 @@ private class ReviewStub
             public string Rating { get; set; }
             public bool? IsFavourite { get; set; }
             public Color Color { get; set; }
+
+            public DateTime? DateLastRead { get; set; }
+            public DateTime? DateLastCited { get; set; }
+            public DateTime? DateAddedToDatabase { get; set; }
         }
 
         private ReviewStub review_stub = null;
@@ -227,6 +231,23 @@ private void ButtonApplyReview_Click(object sender, RoutedEventArgs e)
                     pdf_document.Color = review_stub.Color;
                     pdf_document.Bindable.NotifyPropertyChanged(nameof(pdf_document.Color));
                 }
+#if false
+                if (review_stub.DateAddedToDatabase != null)
+                {
+                    pdf_document.DateAddedToDatabase = review_stub.DateAddedToDatabase.Value;
+                    pdf_document.Bindable.NotifyPropertyChanged(nameof(pdf_document.DateAddedToDatabase));
+                }
+                if (review_stub.DateLastCited != null)
+                {
+                    pdf_document.DateLastCited = review_stub.DateLastCited.Value;
+                    pdf_document.Bindable.NotifyPropertyChanged(nameof(pdf_document.DateLastCited));
+                }
+                if (review_stub.DateLastRead != null)
+                {
+                    pdf_document.DateLastRead = review_stub.DateLastRead.Value;
+                    pdf_document.Bindable.NotifyPropertyChanged(nameof(pdf_document.DateLastRead));
+                }
+#endif
             }
         }
 
diff --git a/QiqqaLegacyFileFormats/packages.config b/QiqqaLegacyFileFormats/packages.config
index a10a78421..51b069052 100644
--- a/QiqqaLegacyFileFormats/packages.config
+++ b/QiqqaLegacyFileFormats/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AlphaFS" version="2.2.6" targetFramework="net472" />
+  <package id="AlphaFS" version="2.2.6" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
   <package id="protobuf-net" version="3.1.17" targetFramework="net48" />
   <package id="protobuf-net.Core" version="3.1.17" targetFramework="net48" />
diff --git a/QiqqaOCR/packages.config b/QiqqaOCR/packages.config
index 99ae3b4d1..e011f69c2 100644
--- a/QiqqaOCR/packages.config
+++ b/QiqqaOCR/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AlphaFS" version="2.2.6" targetFramework="net472" />
+  <package id="AlphaFS" version="2.2.6" targetFramework="net48" />
   <package id="log4net" version="2.0.15" targetFramework="net48" />
   <package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
diff --git a/QiqqaSystemTester/QiqqaSystemTester.csproj b/QiqqaSystemTester/QiqqaSystemTester.csproj
index f17a0b88b..e309874f0 100644
--- a/QiqqaSystemTester/QiqqaSystemTester.csproj
+++ b/QiqqaSystemTester/QiqqaSystemTester.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props')" />
   <Import Project="..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props" Condition="Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -89,6 +89,7 @@
     <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>
     </Reference>
+    <Reference Include="PresentationCore" />
     <Reference Include="System" />
     <Reference Include="System.CodeDom, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.CodeDom.6.0.0\lib\net461\System.CodeDom.dll</HintPath>
@@ -130,6 +131,7 @@
     <Reference Include="TextCopy, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1ca091877d12ca03, processorArchitecture=MSIL">
       <HintPath>..\packages\TextCopy.6.1.0\lib\net461\TextCopy.dll</HintPath>
     </Reference>
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\QiqqaUnitTester\ApprovalTestsConfig.cs">
@@ -199,22 +201,22 @@
   </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>$(SolutionDir)Qiqqa.Build\copy_mupdf_binaries.cmd $(TargetDir) $(ConfigurationName) $(ProjectDir)</PreBuildEvent>
+  </PropertyGroup>
+  <Import Project="..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets" Condition="Exists('..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets'))" />
-    <Error Condition="!Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props'))" />
-    <Error Condition="!Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets'))" />
     <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props'))" />
     <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets'))" />
     <Error Condition="!Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props'))" />
+    <Error Condition="!Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets'))" />
   </Target>
-  <PropertyGroup>
-    <PreBuildEvent>$(SolutionDir)Qiqqa.Build\copy_mupdf_binaries.cmd $(TargetDir) $(ConfigurationName) $(ProjectDir)</PreBuildEvent>
-  </PropertyGroup>
-  <Import Project="..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets" Condition="Exists('..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets')" />
-  <Import Project="..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets" Condition="Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets')" />
   <Import Project="..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
+  <Import Project="..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets" Condition="Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets')" />
 </Project>
\ No newline at end of file
diff --git a/QiqqaSystemTester/packages.config b/QiqqaSystemTester/packages.config
index c67351a19..c2e3ad8c7 100644
--- a/QiqqaSystemTester/packages.config
+++ b/QiqqaSystemTester/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AlphaFS" version="2.2.6" targetFramework="net472" />
+  <package id="AlphaFS" version="2.2.6" targetFramework="net48" />
   <package id="ApprovalTests" version="5.7.3" targetFramework="net48" />
   <package id="ApprovalUtilities" version="5.7.3" targetFramework="net48" />
   <package id="DiffEngine" version="10.0.3" targetFramework="net48" />
@@ -13,7 +13,6 @@
   <package id="MSTest.TestAdapter" version="2.2.10" targetFramework="net48" />
   <package id="MSTest.TestFramework" version="2.2.10" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
-  <package id="PDFsharp-wpf" version="1.51.5185-beta" targetFramework="net472" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.116.0" targetFramework="net48" />
   <package id="System.CodeDom" version="6.0.0" targetFramework="net48" />
   <package id="System.Data.SqlClient" version="4.8.3" targetFramework="net48" />
diff --git a/QiqqaTestHelpers/QiqqaTestHelpers.csproj b/QiqqaTestHelpers/QiqqaTestHelpers.csproj
index 218b19fbd..9429fbfd2 100644
--- a/QiqqaTestHelpers/QiqqaTestHelpers.csproj
+++ b/QiqqaTestHelpers/QiqqaTestHelpers.csproj
@@ -74,15 +74,15 @@
     <Compile Include="MiscTestHelpers.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Utilities\Utilities.csproj">
       <Project>{b0289358-e81c-4094-9db1-f520f24d339b}</Project>
       <Name>Utilities</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/QiqqaTestHelpers/packages.config b/QiqqaTestHelpers/packages.config
index 7708dab7f..83da66cc6 100644
--- a/QiqqaTestHelpers/packages.config
+++ b/QiqqaTestHelpers/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AlphaFS" version="2.2.6" targetFramework="net472" />
+  <package id="AlphaFS" version="2.2.6" targetFramework="net48" />
   <package id="log4net" version="2.0.15" targetFramework="net48" />
   <package id="MSTest.TestAdapter" version="2.2.10" targetFramework="net48" />
   <package id="MSTest.TestFramework" version="2.2.10" targetFramework="net48" />
diff --git a/QiqqaToolBench/QiqqaToolBench.csproj b/QiqqaToolBench/QiqqaToolBench.csproj
index dd10513b9..7f5284a79 100644
--- a/QiqqaToolBench/QiqqaToolBench.csproj
+++ b/QiqqaToolBench/QiqqaToolBench.csproj
@@ -49,6 +49,9 @@
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AlphaFS, Version=2.2.0.0, Culture=neutral, PublicKeyToken=4d31a58f7d7ad5c9, processorArchitecture=MSIL">
+      <HintPath>..\packages\AlphaFS.2.2.6\lib\net452\AlphaFS.dll</HintPath>
+    </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.11.46.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.11.46\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
@@ -61,6 +64,7 @@
     <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>
     </Reference>
+    <Reference Include="PresentationCore" />
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -76,6 +80,7 @@
     <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
     </Reference>
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -86,6 +91,7 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Form1.cs">
diff --git a/QiqqaToolBench/packages.config b/QiqqaToolBench/packages.config
index c3d39fc76..1ded75b06 100644
--- a/QiqqaToolBench/packages.config
+++ b/QiqqaToolBench/packages.config
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AlphaFS" version="2.2.6" targetFramework="net472" />
+  <package id="AlphaFS" version="2.2.6" targetFramework="net48" />
   <package id="HtmlAgilityPack" version="1.11.46" targetFramework="net48" />
   <package id="log4net" version="2.0.15" targetFramework="net48" />
   <package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
-  <package id="PDFsharp-wpf" version="1.51.5185-beta" targetFramework="net472" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.116.0" targetFramework="net48" />
   <package id="System.Data.SqlClient" version="4.8.3" targetFramework="net48" />
   <package id="System.Data.SQLite.Core" version="1.0.116.0" targetFramework="net48" />
diff --git a/QiqqaUIPartsTester/QiqqaUIPartsTester.csproj b/QiqqaUIPartsTester/QiqqaUIPartsTester.csproj
index f6b70b43b..c61ba668c 100644
--- a/QiqqaUIPartsTester/QiqqaUIPartsTester.csproj
+++ b/QiqqaUIPartsTester/QiqqaUIPartsTester.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props')" />
   <Import Project="..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props" Condition="Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -51,6 +51,9 @@
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AlphaFS, Version=2.2.0.0, Culture=neutral, PublicKeyToken=4d31a58f7d7ad5c9, processorArchitecture=MSIL">
+      <HintPath>..\packages\AlphaFS.2.2.6\lib\net452\AlphaFS.dll</HintPath>
+    </Reference>
     <Reference Include="Appium.Net, Version=4.3.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Appium.WebDriver.4.3.2\lib\net45\Appium.Net.dll</HintPath>
     </Reference>
@@ -93,6 +96,9 @@
     <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>
     </Reference>
+    <Reference Include="SeleniumExtras.PageObjects, Version=3.11.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetSeleniumExtras.PageObjects.3.11.0\lib\net45\SeleniumExtras.PageObjects.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.CodeDom, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.CodeDom.6.0.0\lib\net461\System.CodeDom.dll</HintPath>
@@ -127,6 +133,7 @@
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -225,19 +232,19 @@
     <Folder Include="Controls\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets" Condition="Exists('..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets'))" />
-    <Error Condition="!Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props'))" />
-    <Error Condition="!Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets'))" />
     <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props'))" />
     <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets'))" />
     <Error Condition="!Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props'))" />
+    <Error Condition="!Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets'))" />
   </Target>
-  <Import Project="..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets" Condition="Exists('..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets')" />
-  <Import Project="..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets" Condition="Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets')" />
   <Import Project="..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
+  <Import Project="..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets" Condition="Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets')" />
 </Project>
\ No newline at end of file
diff --git a/QiqqaUIPartsTester/packages.config b/QiqqaUIPartsTester/packages.config
index fd9d18ac8..cbc318573 100644
--- a/QiqqaUIPartsTester/packages.config
+++ b/QiqqaUIPartsTester/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AlphaFS" version="2.2.6" targetFramework="net472" />
+  <package id="AlphaFS" version="2.2.6" targetFramework="net48" />
   <package id="Appium.WebDriver" version="4.3.2" targetFramework="net48" />
   <package id="ApprovalTests" version="5.7.3" targetFramework="net48" />
   <package id="ApprovalUtilities" version="5.7.3" targetFramework="net48" />
   <package id="Castle.Core" version="5.1.0" targetFramework="net48" />
   <package id="DiffEngine" version="10.0.3" targetFramework="net48" />
-  <package id="DotNetSeleniumExtras.PageObjects" version="3.11.0" targetFramework="net472" />
+  <package id="DotNetSeleniumExtras.PageObjects" version="3.11.0" targetFramework="net48" />
   <package id="EmptyFiles" version="2.8.0" targetFramework="net48" />
   <package id="HtmlAgilityPack" version="1.11.46" targetFramework="net48" />
   <package id="log4net" version="2.0.15" targetFramework="net48" />
@@ -16,7 +16,6 @@
   <package id="MSTest.TestAdapter" version="2.2.10" targetFramework="net48" />
   <package id="MSTest.TestFramework" version="2.2.10" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
-  <package id="PDFsharp-wpf" version="1.51.5185-beta" targetFramework="net472" />
   <package id="Selenium.Support" version="4.4.0" targetFramework="net48" />
   <package id="Selenium.WebDriver" version="4.4.0" targetFramework="net48" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.116.0" targetFramework="net48" />
diff --git a/QiqqaUnitTester/QiqqaUnitTester.csproj b/QiqqaUnitTester/QiqqaUnitTester.csproj
index d273edf99..69b3776d2 100644
--- a/QiqqaUnitTester/QiqqaUnitTester.csproj
+++ b/QiqqaUnitTester/QiqqaUnitTester.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props')" />
   <Import Project="..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props" Condition="Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -89,6 +89,7 @@
     <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>
     </Reference>
+    <Reference Include="PresentationCore" />
     <Reference Include="System" />
     <Reference Include="System.CodeDom, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.CodeDom.6.0.0\lib\net461\System.CodeDom.dll</HintPath>
@@ -130,6 +131,7 @@
     <Reference Include="TextCopy, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1ca091877d12ca03, processorArchitecture=MSIL">
       <HintPath>..\packages\TextCopy.6.1.0\lib\net461\TextCopy.dll</HintPath>
     </Reference>
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Utilities\BibTex\EndNoteToBibTex.cs">
@@ -169,12 +171,12 @@
       <Link>BibTeX\EntryTypeDefinitions\qiqqa-entry-type-definitions.json</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="packages.config" />
     <None Include="patch_bulk_tests.js" />
     <None Include="..\Utilities\BibTex\TestFiles\Sample.bib">
       <Link>data\Utilities\BibTeX\Sample.bib</Link>
     </None>
     <None Include="App.config" />
-    <None Include="packages.config" />
     <None Include="patch_bulk_tests.sh" />
   </ItemGroup>
   <ItemGroup>
@@ -199,25 +201,25 @@
   </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>$(SolutionDir)Qiqqa.Build\copy_mupdf_binaries.cmd $(TargetDir) $(ConfigurationName) $(ProjectDir)</PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RunSettingsFilePath>$(SolutionDir)\QiqqaTests.runsettings</RunSettingsFilePath>
+  </PropertyGroup>
+  <Import Project="..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets" Condition="Exists('..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets'))" />
-    <Error Condition="!Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props'))" />
-    <Error Condition="!Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets'))" />
     <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.props'))" />
     <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets'))" />
     <Error Condition="!Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ApprovalTests.5.7.3\build\ApprovalTests.props'))" />
+    <Error Condition="!Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets'))" />
   </Target>
-  <PropertyGroup>
-    <PreBuildEvent>$(SolutionDir)Qiqqa.Build\copy_mupdf_binaries.cmd $(TargetDir) $(ConfigurationName) $(ProjectDir)</PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RunSettingsFilePath>$(SolutionDir)\QiqqaTests.runsettings</RunSettingsFilePath>
-  </PropertyGroup>
-  <Import Project="..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets" Condition="Exists('..\packages\EmptyFiles.2.8.0\build\EmptyFiles.targets')" />
-  <Import Project="..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets" Condition="Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets')" />
   <Import Project="..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.10\build\net46\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
+  <Import Project="..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets" Condition="Exists('..\packages\ApprovalTests.5.7.3\build\ApprovalTests.targets')" />
 </Project>
\ No newline at end of file
diff --git a/QiqqaUnitTester/packages.config b/QiqqaUnitTester/packages.config
index c67351a19..c2e3ad8c7 100644
--- a/QiqqaUnitTester/packages.config
+++ b/QiqqaUnitTester/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AlphaFS" version="2.2.6" targetFramework="net472" />
+  <package id="AlphaFS" version="2.2.6" targetFramework="net48" />
   <package id="ApprovalTests" version="5.7.3" targetFramework="net48" />
   <package id="ApprovalUtilities" version="5.7.3" targetFramework="net48" />
   <package id="DiffEngine" version="10.0.3" targetFramework="net48" />
@@ -13,7 +13,6 @@
   <package id="MSTest.TestAdapter" version="2.2.10" targetFramework="net48" />
   <package id="MSTest.TestFramework" version="2.2.10" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
-  <package id="PDFsharp-wpf" version="1.51.5185-beta" targetFramework="net472" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.116.0" targetFramework="net48" />
   <package id="System.CodeDom" version="6.0.0" targetFramework="net48" />
   <package id="System.Data.SqlClient" version="4.8.3" targetFramework="net48" />
diff --git a/QiqqaVersionMigrator/QiqqaVersionMigrator.csproj b/QiqqaVersionMigrator/QiqqaVersionMigrator.csproj
index c159f096a..dd0f66024 100644
--- a/QiqqaVersionMigrator/QiqqaVersionMigrator.csproj
+++ b/QiqqaVersionMigrator/QiqqaVersionMigrator.csproj
@@ -63,6 +63,9 @@
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AlphaFS, Version=2.2.0.0, Culture=neutral, PublicKeyToken=4d31a58f7d7ad5c9, processorArchitecture=MSIL">
+      <HintPath>..\packages\AlphaFS.2.2.6\lib\net452\AlphaFS.dll</HintPath>
+    </Reference>
     <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
@@ -87,6 +90,7 @@
     <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
     </Reference>
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/QiqqaVersionMigrator/packages.config b/QiqqaVersionMigrator/packages.config
index 8b471d9d8..e1c2058c8 100644
--- a/QiqqaVersionMigrator/packages.config
+++ b/QiqqaVersionMigrator/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AlphaFS" version="2.2.6" targetFramework="net472" />
+  <package id="AlphaFS" version="2.2.6" targetFramework="net48" />
   <package id="log4net" version="2.0.15" targetFramework="net48" />
   <package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
diff --git a/docs-src/Notes/How to build Qiqqa from source.md b/docs-src/Notes/How to build Qiqqa from source.md
index 570575355..ca27cad08 100644
--- a/docs-src/Notes/How to build Qiqqa from source.md	
+++ b/docs-src/Notes/How to build Qiqqa from source.md	
@@ -64,6 +64,7 @@ If you want to build Qiqqa from scratch yourself and/or wish to participate in i
    which will load `MuPDF`, `tesseract` and several other git repositories onto your local storage.
 - Double-click the `Qiqqa.sln` file to open it in Visual Studio.
 - Wait for Visual Studio to install the required NuGet packages.
+  > You may need to forcibly re-install NuGet packages when you upgrade Visual Studio later on. Then you find https://stackoverflow.com/questions/38074578/nuget-has-problems-with-missing-packages-how-to-restore very useful!
 - From the Build menu, pick "Rebuild all".
    + This will take *quite a while* as this will instruct Visual Studio to go and build all referenced projects (libraries, etc. used by Qiqqa) from scratch.
 - Select the `Qiqqa` project in the right-hand panel of Visual Studio, right-click and choose "Set as Active Project".