From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sat, 13 Apr 2019 01:10:44 +0000 (+0900)
Subject: some tweaks
X-Git-Tag: 2.16.4+-jp-10~110^2~13^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bbf62f002bc19614e21f2c912e64596bd680e426;p=winmerge-jp%2Fwinmerge-jp.git

some tweaks
---

diff --git a/Src/Common/LanguageSelect.cpp b/Src/Common/LanguageSelect.cpp
index 76fa9df35..d8eba8e61 100644
--- a/Src/Common/LanguageSelect.cpp
+++ b/Src/Common/LanguageSelect.cpp
@@ -6,7 +6,6 @@
 
 #include "StdAfx.h"
 #include "LanguageSelect.h"
-#include "VersionInfo.h"
 #include "BCMenu.h"
 #include "Environment.h"
 #include "paths.h"
diff --git a/Src/Common/ShellContextMenu.cpp b/Src/Common/ShellContextMenu.cpp
index 451257971..df8b1b77d 100644
--- a/Src/Common/ShellContextMenu.cpp
+++ b/Src/Common/ShellContextMenu.cpp
@@ -24,7 +24,7 @@
  * @brief Main implementation file for CShellContextMenu
  */
 
-#include "StdAfx.h"
+#include "pch.h"
 #include "ShellContextMenu.h"
 #include "PidlContainer.h"
 
@@ -147,7 +147,7 @@ bool CShellContextMenu::QueryShellContextMenu()
 			LPITEMIDLIST dirPidl;
 			if (FAILED(/*hr = */pDesktop->ParseDisplayName(nullptr,				   // hwnd
 													   nullptr,					   // pbc
-													   CT2OLE(currentDir.c_str()), // pszDisplayName
+													   const_cast<wchar_t *>(currentDir.c_str()),	// pszDisplayName
 													   nullptr,					   // pchEaten
 													   &dirPidl,				   // ppidl
 													   nullptr					   // pdwAttributes
@@ -172,7 +172,7 @@ bool CShellContextMenu::QueryShellContextMenu()
 		LPITEMIDLIST pidl;
 		if (FAILED(/*hr = */pCurrFolder->ParseDisplayName(nullptr,
 													  nullptr,
-													  CT2OLE(file.filename.c_str()), 
+													  const_cast<wchar_t *>(file.filename.c_str()), 
 													  nullptr,
 													  &pidl,
 													  nullptr)))
@@ -213,7 +213,7 @@ bool CShellContextMenu::QueryShellContextMenu()
 		m_pPreferredMenu = pCMenu3;
 	}
 
-	ASSERT(::IsMenu(m_hShellContextMenu));
+	assert(::IsMenu(m_hShellContextMenu));
 	if (FAILED(/*hr = */m_pPreferredMenu->QueryContextMenu(m_hShellContextMenu,
 													   0,
 													   m_cmdFirst,
@@ -241,7 +241,7 @@ bool CShellContextMenu::InvokeCommand(UINT nCmd, HWND hWnd)
 		ici.nShow = SW_SHOWNORMAL;
 
 		HRESULT hr = m_pPreferredMenu->InvokeCommand(&ici);
-		ASSERT(SUCCEEDED(hr));
+		assert(SUCCEEDED(hr));
 		return SUCCEEDED(hr);
 	}
 	else 
@@ -252,12 +252,12 @@ bool CShellContextMenu::InvokeCommand(UINT nCmd, HWND hWnd)
 
 bool CShellContextMenu::RequeryShellContextMenu()
 {
-	ASSERT(::IsMenu(m_hShellContextMenu));
+	assert(::IsMenu(m_hShellContextMenu));
 	while (::GetMenuItemCount(m_hShellContextMenu) > 0)
 	{
 		::DeleteMenu(m_hShellContextMenu, 0, MF_BYPOSITION);
 	}
-	ASSERT(::GetMenuItemCount(m_hShellContextMenu) == 0);
+	assert(::GetMenuItemCount(m_hShellContextMenu) == 0);
 
 	return QueryShellContextMenu();
 }
diff --git a/Src/Common/ShellContextMenu.h b/Src/Common/ShellContextMenu.h
index 8f479fbbf..eb8338abf 100644
--- a/Src/Common/ShellContextMenu.h
+++ b/Src/Common/ShellContextMenu.h
@@ -24,11 +24,11 @@
  */ 
 #pragma once
 
-#include <comdef.h>
 #pragma warning (push)			// prevent "warning C4091: 'typedef ': ignored on left of 'tagGPFIDL_FLAGS' when no variable is declared"
 #pragma warning (disable:4091)	// VC bug when using XP enabled toolsets.
 #include <shlobj.h>
 #pragma warning (pop)
+#include <comdef.h>
 #include <list>
 #include "UnicodeString.h"
 
diff --git a/Src/Common/VersionInfo.cpp b/Src/Common/VersionInfo.cpp
index 7b667be8c..80d9f8d90 100644
--- a/Src/Common/VersionInfo.cpp
+++ b/Src/Common/VersionInfo.cpp
@@ -1,5 +1,5 @@
 /**
- *  @file version.cpp
+ *  @file VersionInfo.cpp
  *
  *  @brief Implementation of CVersionInfo class
  */ 
@@ -8,11 +8,9 @@
 #include "VersionInfo.h"
 #include <windows.h>
 #include <cstdio>
-#include <tchar.h>
 #include <cassert>
 #include <strsafe.h>
 #include "UnicodeString.h"
-#include "TFile.h"
 
 /** 
  * @brief Structure used to store language and codepage.
diff --git a/Src/Common/VersionInfo.h b/Src/Common/VersionInfo.h
index e62b39520..6fe003c19 100644
--- a/Src/Common/VersionInfo.h
+++ b/Src/Common/VersionInfo.h
@@ -1,5 +1,5 @@
 /**
- *  @file version.h
+ *  @file VersionInfo.h
  *
  *  @brief Declaration of CVersionInfo class
  */ 
diff --git a/Src/Merge.vs2017.vcxproj b/Src/Merge.vs2017.vcxproj
index 6321bcdd0..cf017e693 100644
--- a/Src/Merge.vs2017.vcxproj
+++ b/Src/Merge.vs2017.vcxproj
@@ -939,7 +939,11 @@
     <ClCompile Include="Common\scbarg.cpp" />
     <ClCompile Include="SelectUnpackerDlg.cpp" />
     <ClCompile Include="SharedFilterDlg.cpp" />
-    <ClCompile Include="Common\ShellContextMenu.cpp" />
+    <ClCompile Include="Common\ShellContextMenu.cpp">
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
+    </ClCompile>
     <ClCompile Include="Common\ShellFileOperations.cpp">
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
diff --git a/Src/Merge.vs2017.vcxproj.filters b/Src/Merge.vs2017.vcxproj.filters
index b83b5ff23..e2ac702bd 100644
--- a/Src/Merge.vs2017.vcxproj.filters
+++ b/Src/Merge.vs2017.vcxproj.filters
@@ -23,9 +23,6 @@
       <UniqueIdentifier>{b889169f-de55-4db7-ad06-423f6438fa90}</UniqueIdentifier>
       <Extensions>cpp;c;h</Extensions>
     </Filter>
-    <Filter Include="EditLib\parsers">
-      <UniqueIdentifier>{740d4dd9-ab31-47b8-9cbb-8e6a7b5db4fe}</UniqueIdentifier>
-    </Filter>
     <Filter Include="MFCGui">
       <UniqueIdentifier>{caf52667-921a-47aa-84a3-f277aac15107}</UniqueIdentifier>
     </Filter>
@@ -38,9 +35,6 @@
     <Filter Include="MFCGui\Dialogs">
       <UniqueIdentifier>{d520b3a7-c530-4053-8766-07c26ed85f85}</UniqueIdentifier>
     </Filter>
-    <Filter Include="MFCGui\Dialogs\PropertyPages">
-      <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>
-    </Filter>
     <Filter Include="MFCGui\Common">
       <UniqueIdentifier>{297182f0-e39d-4ac4-9df3-315882ce9e07}</UniqueIdentifier>
     </Filter>
@@ -62,6 +56,57 @@
     <Filter Include="MergeTest\gtest">
       <UniqueIdentifier>{67c954df-e54f-4070-9c75-68ef52a00e03}</UniqueIdentifier>
     </Filter>
+    <Filter Include="MFCGui\Common\Header Files">
+      <UniqueIdentifier>{30ca9a5d-4b26-4d57-b39b-f7fe3e7c7abc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MFCGui\Common\Source Files">
+      <UniqueIdentifier>{567b3ec4-d358-4290-8a27-4e87c11cfb55}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MFCGui\Dialogs\Source Files">
+      <UniqueIdentifier>{befda2e3-2f20-4080-89b1-803c6935bf05}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MFCGui\Dialogs\Header Files">
+      <UniqueIdentifier>{a988a22b-3d18-4d67-bf3e-8912bf9940f2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MFCGui\PropertyPages">
+      <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MFCGui\PropertyPages\Source Files">
+      <UniqueIdentifier>{bc0e280a-2589-4e45-883e-1eb0db655c07}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MFCGui\PropertyPages\Header Files">
+      <UniqueIdentifier>{313fa20e-cf17-46e5-8ebf-c16b07786225}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Common">
+      <UniqueIdentifier>{9545a3ff-6867-464f-a244-755ed58529e0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Common\Header Files">
+      <UniqueIdentifier>{cef4b0e0-5b0d-4f4f-8522-fe6eb66f3fa5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Common\Source Files">
+      <UniqueIdentifier>{ae04066b-7462-4a9b-8120-6d72fa5fe73e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="EditLib\Source Files">
+      <UniqueIdentifier>{7ebea8c0-3335-4e4d-b56f-222e5c5b700a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="EditLib\Header Files">
+      <UniqueIdentifier>{295aa90c-8c94-400a-a4e3-84cac2b447f0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="EditLib\Parsers">
+      <UniqueIdentifier>{740d4dd9-ab31-47b8-9cbb-8e6a7b5db4fe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="EditLib\Parsers\Source Files">
+      <UniqueIdentifier>{dcc78107-52dc-43d1-b4f7-7acf8c71fce4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="EditLib\Parsers\Header Files">
+      <UniqueIdentifier>{1de6d090-09d8-423e-9a39-92e523334e4e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Compare Engines\Source Files">
+      <UniqueIdentifier>{e80d7ff2-f4b2-4c37-8db5-e26835cd90cf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Compare Engines\Header Files">
+      <UniqueIdentifier>{e0f6e1ca-9725-4a97-81da-adf12e7a4e42}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="charsets.c">
@@ -82,9 +127,6 @@
     <ClCompile Include="ConflictFileParser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\coretools.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="DiffContext.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -157,9 +199,6 @@
     <ClCompile Include="locality.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\lwdisp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="markdown.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -172,15 +211,9 @@
     <ClCompile Include="MovedLines.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\multiformatText.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="OptionsInit.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="common\OptionsMgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="PatchHTML.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -190,9 +223,6 @@
     <ClCompile Include="paths.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\PidlContainer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="PluginManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -202,36 +232,15 @@
     <ClCompile Include="ProjectFile.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\RegKey.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\RegOptionsMgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ShellFileOperations.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="stringdiffs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="TempFile.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\unicoder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\UnicodeString.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\UniFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="UniMarkdownFile.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\varprop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="diffutils\src\analyze.c">
       <Filter>GNU diffutils</Filter>
     </ClCompile>
@@ -265,195 +274,12 @@
     <ClCompile Include="diffutils\src\util.c">
       <Filter>GNU diffutils</Filter>
     </ClCompile>
-    <ClCompile Include="CompareEngines\ByteComparator.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ByteCompare.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\vhdl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
     <ClCompile Include="MergeApp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="7zCommon.cpp">
       <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\CMoveConstraint.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ColorButton.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="DiffTextBuffer.cpp">
       <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
@@ -538,12 +364,6 @@
     <ClCompile Include="StdAfx.cpp">
       <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\LanguageSelect.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ExConverter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="DirCompProgressBar.cpp">
       <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
@@ -559,233 +379,458 @@
     <ClCompile Include="OptionsDiffOptions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropArchive.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="PatchTool.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropBackups.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="JumpList.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropCodepage.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="OptionsCustomColors.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="ImgMergeFrm.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropCompare.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropCompareFolder.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="LineFiltersList.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropEditor.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="DirViewColItems.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropGeneral.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="DirActions.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropRegistry.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="DropHandler.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropShell.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="OptionsDef.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropSyntaxColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="TrDialogs.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropTextColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="MergeStatusBar.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="AboutDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="diffutils\src\mystat.cpp">
+      <Filter>GNU diffutils</Filter>
     </ClCompile>
-    <ClCompile Include="DirCmpReportDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="MergeEditSplitterView.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="DirColsDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="Test.cpp">
+      <Filter>MergeTest</Filter>
     </ClCompile>
-    <ClCompile Include="LineFiltersDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="TestMain.cpp">
+      <Filter>MergeTest</Filter>
     </ClCompile>
-    <ClCompile Include="LoadSaveCodepageDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">
+      <Filter>MergeTest\gtest</Filter>
     </ClCompile>
-    <ClCompile Include="PatchDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="Merge7zFormatShellImpl.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PluginsListDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="pch.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SaveClosingDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="OptionsPanel.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SelectUnpackerDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="MergeEditFrm.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SharedFilterDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="Common\BCMenu.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="TestFilterDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="Common\Bitmap.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="WMGotoDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="Common\CMoveConstraint.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="FileFiltersDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="Common\ColorButton.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\LanguageSelect.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\MDITabBar.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\MessageBoxDialog.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\Picture.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\PropertyPageHost.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\scbarcf.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\scbarg.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\sizecbar.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\SortHeaderCtrl.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\SplitterWndEx.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\SuperComboBox.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="AboutDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="CompareStatisticsDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="ConfirmFolderCopyDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PatchTool.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="DirCmpReportDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\SortHeaderCtrl.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="DirColsDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FileFiltersDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LineFiltersDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LoadSaveCodepageDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PatchDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PluginsListDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Common\PreferencesDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="JumpList.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="SaveClosingDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\ClipBoard.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="SelectUnpackerDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="OptionsCustomColors.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="SharedFilterDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ImgMergeFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="TestFilterDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropCompareImage.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="WMGotoDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="PropArchive.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="LineFiltersList.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="PropBackups.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="CompareEngines\BinaryCompare.cpp">
-      <Filter>Compare Engines</Filter>
+    <ClCompile Include="PropCodepage.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PropColors.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PropCompare.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="PropCompareBinary.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="DirViewColItems.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="PropCompareFolder.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="DirActions.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="PropCompareImage.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="DropHandler.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="PropEditor.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="OptionsDef.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="PropGeneral.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\scbarg.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="PropMarkerColors.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\scbarcf.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="PropRegistry.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\sizecbar.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="PropShell.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\BCMenu.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="PropSyntaxColors.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\MDITabBar.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="PropTextColors.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\MessageBoxDialog.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="Common\ClipBoard.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\SuperComboBox.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="Common\coretools.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\SplitterWndEx.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="Common\lwdisp.c">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\Bitmap.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="Common\RegKey.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\Picture.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="Common\ShellFileOperations.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\ShellContextMenu.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="Common\UniFile.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\PropertyPageHost.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="Common\UnicodeString.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="TrDialogs.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="Common\unicoder.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="MergeStatusBar.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="Common\RegOptionsMgr.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="diffutils\src\mystat.cpp">
-      <Filter>GNU diffutils</Filter>
+    <ClCompile Include="Common\PidlContainer.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp">
-      <Filter>EditLib\parsers</Filter>
+    <ClCompile Include="common\OptionsMgr.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">
-      <Filter>EditLib\parsers</Filter>
+    <ClCompile Include="Common\multiformatText.cpp">
+      <Filter>Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\ExConverter.cpp">
+      <Filter>Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\varprop.cpp">
+      <Filter>Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp">
-      <Filter>EditLib</Filter>
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.cpp">
-      <Filter>EditLib</Filter>
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropMarkerColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\VersionInfo.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="MergeEditSplitterView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">
-      <Filter>Compare Engines</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Test.cpp">
-      <Filter>MergeTest</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="TestMain.cpp">
-      <Filter>MergeTest</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">
-      <Filter>MergeTest\gtest</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Merge7zFormatShellImpl.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\Externals\crystaledit\editlib\wcwidth.cpp">
-      <Filter>EditLib</Filter>
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="OptionsPanel.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\plain.cpp">
-      <Filter>EditLib\parsers</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\Externals\crystaledit\editlib\lua.cpp">
-      <Filter>EditLib\parsers</Filter>
+      <Filter>EditLib\Parsers\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="MergeEditFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\plain.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\vhdl.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CompareEngines\BinaryCompare.cpp">
+      <Filter>Compare Engines\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CompareEngines\ByteComparator.cpp">
+      <Filter>Compare Engines\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CompareEngines\ByteCompare.cpp">
+      <Filter>Compare Engines\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">
+      <Filter>Compare Engines\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">
+      <Filter>Compare Engines\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\VersionInfo.cpp">
+      <Filter>Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\ShellContextMenu.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -807,9 +852,6 @@
     <ClInclude Include="ConflictFileParser.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\coretools.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="DiffContext.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -906,9 +948,6 @@
     <ClInclude Include="locality.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\lwdisp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="markdown.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -918,15 +957,9 @@
     <ClInclude Include="MovedLines.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\multiformatText.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="OptionsDef.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="common\OptionsMgr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="PatchHTML.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -936,9 +969,6 @@
     <ClInclude Include="paths.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\PidlContainer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="PluginManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -948,15 +978,6 @@
     <ClInclude Include="ProjectFile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\RegKey.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\RegOptionsMgr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ShellFileOperations.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="stringdiffs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -966,21 +987,9 @@
     <ClInclude Include="TempFile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\unicoder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\UnicodeString.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\UniFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="UniMarkdownFile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\varprop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="diffutils\lib\cmpbuf.h">
       <Filter>GNU diffutils</Filter>
     </ClInclude>
@@ -993,93 +1002,6 @@
     <ClInclude Include="diffutils\src\system.h">
       <Filter>GNU diffutils</Filter>
     </ClInclude>
-    <ClInclude Include="CompareEngines\ByteComparator.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\ByteCompare.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\TimeSizeCompare.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\registry.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
     <ClInclude Include="StdAfx.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
@@ -1146,311 +1068,434 @@
     <ClInclude Include="DirDoc.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DirFrame.h">
+    <ClInclude Include="DirFrame.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DirView.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="EditorFilepathBar.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="EncodingErrorBar.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FileActionScript.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FilepathEdit.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IListCtrlImpl.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MergeLineFlags.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MergeApp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DirCompProgressBar.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Diff3.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsFont.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsSyntaxColors.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsDiffColors.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsDiffOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PatchTool.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="JumpList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsCustomColors.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="7zCommon.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ImgMergeFrm.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IMergeDoc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Merge7zFormatMergePluginImpl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Merge7zFormatRegister.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DirViewColItems.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DirActions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="HexMergeView.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DirView.h">
+    <ClInclude Include="OptionsPanel.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="EditorFilepathBar.h">
+    <ClInclude Include="DropHandler.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="EncodingErrorBar.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="Constants.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="FileActionScript.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="OptionsInit.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="FilepathEdit.h">
+    <ClInclude Include="TrDialogs.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\LanguageSelect.h">
+    <ClInclude Include="MergeStatusBar.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="IListCtrlImpl.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="..\Externals\boost\boost\config.hpp">
+      <Filter>Boost</Filter>
     </ClInclude>
-    <ClInclude Include="MergeLineFlags.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp">
+      <Filter>Boost\config\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="MergeApp.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp">
+      <Filter>Boost\config</Filter>
     </ClInclude>
-    <ClInclude Include="Common\ExConverter.h">
+    <ClInclude Include="..\Version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DirCompProgressBar.h">
+    <ClInclude Include="MergeEditSplitterView.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Diff3.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="TestMain.h">
+      <Filter>MergeTest</Filter>
     </ClInclude>
-    <ClInclude Include="OptionsFont.h">
+    <ClInclude Include="Win_VersionHelper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OptionsSyntaxColors.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">
+      <Filter>MergeTest\gtest</Filter>
     </ClInclude>
-    <ClInclude Include="OptionsDiffColors.h">
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest-printers.h">
+      <Filter>MergeTest\gtest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Externals\gtest\include\gtest\internal\gtest-port.h">
+      <Filter>MergeTest\gtest</Filter>
+    </ClInclude>
+    <ClInclude Include="Merge7zFormatShellImpl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OptionsDiffOptions.h">
+    <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropArchive.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="MergeEditFrm.h">
+      <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropBackups.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\BCMenu.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropCodepage.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\Bitmap.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\CMoveConstraint.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropCompare.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\ColorButton.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropCompareFolder.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\LanguageSelect.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropEditor.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\MDITabBar.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropGeneral.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\memdc.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropRegistry.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\MessageBoxDialog.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropShell.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\Picture.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropSyntaxColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\scbarcf.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropTextColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\PropertyPageHost.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\scbarg.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\sizecbar.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\SortHeaderCtrl.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\SplitterWndEx.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\SuperComboBox.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="AboutDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="CompareStatisticsDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="ConfirmFolderCopyDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="DirCmpReportDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="FileFiltersDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClInclude Include="DirColsDlg.h">
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="LoadSaveCodepageDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClInclude Include="FileFiltersDlg.h">
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="LineFiltersDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LoadSaveCodepageDlg.h">
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="PatchDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="PluginsListDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\PreferencesDlg.h">
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="SaveClosingDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="SelectUnpackerDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="SharedFilterDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="TestFilterDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="WMGotoDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="DirColsDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PatchTool.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="PropArchive.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\PreferencesDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClInclude Include="PropBackups.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="JumpList.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropCodepage.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\ClipBoard.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropColors.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OptionsCustomColors.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropCompare.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="7zCommon.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="PropCompareBinary.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ImgMergeFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="PropCompareFolder.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="PropCompareImage.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="IMergeDoc.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropEditor.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Merge7zFormatMergePluginImpl.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropGeneral.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Merge7zFormatRegister.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropMarkerColors.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CompareEngines\BinaryCompare.h">
-      <Filter>Compare Engines</Filter>
+    <ClInclude Include="PropRegistry.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DirViewColItems.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropShell.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DirActions.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropSyntaxColors.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="HexMergeView.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="PropTextColors.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropCompareBinary.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\ClipBoard.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\SuperComboBox.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\coretools.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\SortHeaderCtrl.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\lwdisp.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\CMoveConstraint.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\ExConverter.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\MDITabBar.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\UniFile.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\PropertyPageHost.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\UnicodeString.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\SplitterWndEx.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\unicoder.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\sizecbar.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\ShellFileOperations.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\scbarg.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\RegOptionsMgr.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\scbarcf.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\RegKey.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\MessageBoxDialog.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\PidlContainer.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OptionsPanel.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="common\OptionsMgr.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\Bitmap.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\varprop.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\memdc.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\multiformatText.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\ShellContextMenu.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\BCMenu.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\ColorButton.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\Picture.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DropHandler.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Constants.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OptionsInit.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TrDialogs.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MergeStatusBar.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">
-      <Filter>EditLib</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropMarkerColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h">
+      <Filter>EditLib\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.h">
-      <Filter>EditLib</Filter>
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Externals\boost\boost\config.hpp">
-      <Filter>Boost</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp">
-      <Filter>Boost\config\compiler</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp">
-      <Filter>Boost\config</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Version.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\VersionInfo.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MergeEditSplitterView.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">
-      <Filter>Compare Engines</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TestMain.h">
-      <Filter>MergeTest</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Win_VersionHelper.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\registry.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">
-      <Filter>MergeTest\gtest</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Externals\gtest\include\gtest\gtest-printers.h">
-      <Filter>MergeTest\gtest</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Externals\gtest\include\gtest\internal\gtest-port.h">
-      <Filter>MergeTest\gtest</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Merge7zFormatShellImpl.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h">
+      <Filter>EditLib\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\Externals\crystaledit\editlib\wcwidth.h">
-      <Filter>EditLib</Filter>
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\Externals\crystaledit\editlib\crystallineparser.h">
-      <Filter>EditLib\parsers</Filter>
+      <Filter>EditLib\Parsers\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MergeEditFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="CompareEngines\BinaryCompare.h">
+      <Filter>Compare Engines\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CompareEngines\ByteComparator.h">
+      <Filter>Compare Engines\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CompareEngines\ByteCompare.h">
+      <Filter>Compare Engines\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CompareEngines\TimeSizeCompare.h">
+      <Filter>Compare Engines\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">
+      <Filter>Compare Engines\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\VersionInfo.h">
+      <Filter>Common\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\ShellContextMenu.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -1562,4 +1607,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Src/Merge.vs2019.vcxproj b/Src/Merge.vs2019.vcxproj
index 8a2a91604..1ea3485d8 100644
--- a/Src/Merge.vs2019.vcxproj
+++ b/Src/Merge.vs2019.vcxproj
@@ -219,7 +219,6 @@
       <SDLCheck>true</SDLCheck>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
-      <AssemblerOutput>All</AssemblerOutput>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -939,7 +938,11 @@
     <ClCompile Include="Common\scbarg.cpp" />
     <ClCompile Include="SelectUnpackerDlg.cpp" />
     <ClCompile Include="SharedFilterDlg.cpp" />
-    <ClCompile Include="Common\ShellContextMenu.cpp" />
+    <ClCompile Include="Common\ShellContextMenu.cpp">
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
+    </ClCompile>
     <ClCompile Include="Common\ShellFileOperations.cpp">
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
diff --git a/Src/Merge.vs2019.vcxproj.filters b/Src/Merge.vs2019.vcxproj.filters
index fcb4de1bd..e2ac702bd 100644
--- a/Src/Merge.vs2019.vcxproj.filters
+++ b/Src/Merge.vs2019.vcxproj.filters
@@ -23,9 +23,6 @@
       <UniqueIdentifier>{b889169f-de55-4db7-ad06-423f6438fa90}</UniqueIdentifier>
       <Extensions>cpp;c;h</Extensions>
     </Filter>
-    <Filter Include="EditLib\parsers">
-      <UniqueIdentifier>{740d4dd9-ab31-47b8-9cbb-8e6a7b5db4fe}</UniqueIdentifier>
-    </Filter>
     <Filter Include="MFCGui">
       <UniqueIdentifier>{caf52667-921a-47aa-84a3-f277aac15107}</UniqueIdentifier>
     </Filter>
@@ -38,9 +35,6 @@
     <Filter Include="MFCGui\Dialogs">
       <UniqueIdentifier>{d520b3a7-c530-4053-8766-07c26ed85f85}</UniqueIdentifier>
     </Filter>
-    <Filter Include="MFCGui\Dialogs\PropertyPages">
-      <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>
-    </Filter>
     <Filter Include="MFCGui\Common">
       <UniqueIdentifier>{297182f0-e39d-4ac4-9df3-315882ce9e07}</UniqueIdentifier>
     </Filter>
@@ -62,6 +56,57 @@
     <Filter Include="MergeTest\gtest">
       <UniqueIdentifier>{67c954df-e54f-4070-9c75-68ef52a00e03}</UniqueIdentifier>
     </Filter>
+    <Filter Include="MFCGui\Common\Header Files">
+      <UniqueIdentifier>{30ca9a5d-4b26-4d57-b39b-f7fe3e7c7abc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MFCGui\Common\Source Files">
+      <UniqueIdentifier>{567b3ec4-d358-4290-8a27-4e87c11cfb55}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MFCGui\Dialogs\Source Files">
+      <UniqueIdentifier>{befda2e3-2f20-4080-89b1-803c6935bf05}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MFCGui\Dialogs\Header Files">
+      <UniqueIdentifier>{a988a22b-3d18-4d67-bf3e-8912bf9940f2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MFCGui\PropertyPages">
+      <UniqueIdentifier>{c6b39fdf-7c68-42c3-895b-da25bb6e51b4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MFCGui\PropertyPages\Source Files">
+      <UniqueIdentifier>{bc0e280a-2589-4e45-883e-1eb0db655c07}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MFCGui\PropertyPages\Header Files">
+      <UniqueIdentifier>{313fa20e-cf17-46e5-8ebf-c16b07786225}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Common">
+      <UniqueIdentifier>{9545a3ff-6867-464f-a244-755ed58529e0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Common\Header Files">
+      <UniqueIdentifier>{cef4b0e0-5b0d-4f4f-8522-fe6eb66f3fa5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Common\Source Files">
+      <UniqueIdentifier>{ae04066b-7462-4a9b-8120-6d72fa5fe73e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="EditLib\Source Files">
+      <UniqueIdentifier>{7ebea8c0-3335-4e4d-b56f-222e5c5b700a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="EditLib\Header Files">
+      <UniqueIdentifier>{295aa90c-8c94-400a-a4e3-84cac2b447f0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="EditLib\Parsers">
+      <UniqueIdentifier>{740d4dd9-ab31-47b8-9cbb-8e6a7b5db4fe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="EditLib\Parsers\Source Files">
+      <UniqueIdentifier>{dcc78107-52dc-43d1-b4f7-7acf8c71fce4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="EditLib\Parsers\Header Files">
+      <UniqueIdentifier>{1de6d090-09d8-423e-9a39-92e523334e4e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Compare Engines\Source Files">
+      <UniqueIdentifier>{e80d7ff2-f4b2-4c37-8db5-e26835cd90cf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Compare Engines\Header Files">
+      <UniqueIdentifier>{e0f6e1ca-9725-4a97-81da-adf12e7a4e42}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="charsets.c">
@@ -82,9 +127,6 @@
     <ClCompile Include="ConflictFileParser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\coretools.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="DiffContext.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -157,9 +199,6 @@
     <ClCompile Include="locality.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\lwdisp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="markdown.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -172,15 +211,9 @@
     <ClCompile Include="MovedLines.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\multiformatText.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="OptionsInit.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="common\OptionsMgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="PatchHTML.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -190,9 +223,6 @@
     <ClCompile Include="paths.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\PidlContainer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="PluginManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -202,36 +232,15 @@
     <ClCompile Include="ProjectFile.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\RegKey.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\RegOptionsMgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ShellFileOperations.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="stringdiffs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="TempFile.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\unicoder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\UnicodeString.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\UniFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="UniMarkdownFile.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\varprop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="diffutils\src\analyze.c">
       <Filter>GNU diffutils</Filter>
     </ClCompile>
@@ -265,195 +274,12 @@
     <ClCompile Include="diffutils\src\util.c">
       <Filter>GNU diffutils</Filter>
     </ClCompile>
-    <ClCompile Include="CompareEngines\ByteComparator.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ByteCompare.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">
-      <Filter>Compare Engines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\vhdl.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp">
-      <Filter>EditLib\parsers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp">
-      <Filter>EditLib</Filter>
-    </ClCompile>
     <ClCompile Include="MergeApp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="7zCommon.cpp">
       <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\CMoveConstraint.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ColorButton.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="DiffTextBuffer.cpp">
       <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
@@ -538,12 +364,6 @@
     <ClCompile Include="StdAfx.cpp">
       <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\LanguageSelect.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Common\ExConverter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="DirCompProgressBar.cpp">
       <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
@@ -559,233 +379,458 @@
     <ClCompile Include="OptionsDiffOptions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropArchive.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="PatchTool.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropBackups.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="JumpList.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropCodepage.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="OptionsCustomColors.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="ImgMergeFrm.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropCompare.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropCompareFolder.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="LineFiltersList.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropEditor.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="DirViewColItems.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropGeneral.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="DirActions.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropRegistry.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="DropHandler.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropShell.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="OptionsDef.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropSyntaxColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="TrDialogs.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropTextColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="MergeStatusBar.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="AboutDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="diffutils\src\mystat.cpp">
+      <Filter>GNU diffutils</Filter>
     </ClCompile>
-    <ClCompile Include="DirCmpReportDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="MergeEditSplitterView.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="DirColsDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="Test.cpp">
+      <Filter>MergeTest</Filter>
     </ClCompile>
-    <ClCompile Include="LineFiltersDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="TestMain.cpp">
+      <Filter>MergeTest</Filter>
     </ClCompile>
-    <ClCompile Include="LoadSaveCodepageDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">
+      <Filter>MergeTest\gtest</Filter>
     </ClCompile>
-    <ClCompile Include="PatchDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="Merge7zFormatShellImpl.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PluginsListDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="pch.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SaveClosingDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="OptionsPanel.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SelectUnpackerDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="MergeEditFrm.cpp">
+      <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SharedFilterDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="Common\BCMenu.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="TestFilterDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="Common\Bitmap.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="WMGotoDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="Common\CMoveConstraint.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="FileFiltersDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClCompile Include="Common\ColorButton.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\LanguageSelect.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\MDITabBar.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\MessageBoxDialog.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\Picture.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\PropertyPageHost.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\scbarcf.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\scbarg.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\sizecbar.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\SortHeaderCtrl.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\SplitterWndEx.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\SuperComboBox.cpp">
+      <Filter>MFCGui\Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="AboutDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="CompareStatisticsDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="ConfirmFolderCopyDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PatchTool.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="DirCmpReportDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\SortHeaderCtrl.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="DirColsDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FileFiltersDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LineFiltersDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LoadSaveCodepageDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PatchDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PluginsListDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Common\PreferencesDlg.cpp">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="JumpList.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="SaveClosingDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\ClipBoard.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="SelectUnpackerDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="OptionsCustomColors.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="SharedFilterDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ImgMergeFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="TestFilterDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropCompareImage.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="WMGotoDlg.cpp">
+      <Filter>MFCGui\Dialogs\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="PropArchive.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="LineFiltersList.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="PropBackups.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="CompareEngines\BinaryCompare.cpp">
-      <Filter>Compare Engines</Filter>
+    <ClCompile Include="PropCodepage.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PropColors.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PropCompare.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="PropCompareBinary.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="DirViewColItems.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="PropCompareFolder.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="DirActions.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="PropCompareImage.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="DropHandler.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="PropEditor.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="OptionsDef.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="PropGeneral.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\scbarg.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="PropMarkerColors.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\scbarcf.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="PropRegistry.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\sizecbar.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="PropShell.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\BCMenu.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="PropSyntaxColors.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\MDITabBar.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="PropTextColors.cpp">
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\MessageBoxDialog.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="Common\ClipBoard.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\SuperComboBox.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="Common\coretools.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\SplitterWndEx.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="Common\lwdisp.c">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\Bitmap.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="Common\RegKey.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\Picture.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="Common\ShellFileOperations.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\ShellContextMenu.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="Common\UniFile.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\PropertyPageHost.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="Common\UnicodeString.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="TrDialogs.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="Common\unicoder.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="MergeStatusBar.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="Common\RegOptionsMgr.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="diffutils\src\mystat.cpp">
-      <Filter>GNU diffutils</Filter>
+    <ClCompile Include="Common\PidlContainer.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp">
-      <Filter>EditLib\parsers</Filter>
+    <ClCompile Include="common\OptionsMgr.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">
-      <Filter>EditLib\parsers</Filter>
+    <ClCompile Include="Common\multiformatText.cpp">
+      <Filter>Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\ExConverter.cpp">
+      <Filter>Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\varprop.cpp">
+      <Filter>Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp">
-      <Filter>EditLib</Filter>
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\cfindtextdlg.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\chcondlg.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\cregexp_poco.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\cs2cs.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.cpp">
-      <Filter>EditLib</Filter>
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PropMarkerColors.cpp">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\filesup.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Common\VersionInfo.cpp">
-      <Filter>MFCGui\Common</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\fpattern.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="MergeEditSplitterView.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\gotodlg.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">
-      <Filter>Compare Engines</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Test.cpp">
-      <Filter>MergeTest</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\memcombo.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="TestMain.cpp">
-      <Filter>MergeTest</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\registry.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">
-      <Filter>MergeTest\gtest</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\statbar.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Merge7zFormatShellImpl.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\string_util.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp">
+      <Filter>EditLib\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\Externals\crystaledit\editlib\wcwidth.cpp">
-      <Filter>EditLib</Filter>
+      <Filter>EditLib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\asp.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="OptionsPanel.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\basic.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\plain.cpp">
-      <Filter>EditLib\parsers</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\batch.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\cplusplus.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\csharp.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\css.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\dcl.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\fortran.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\go.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\html.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ini.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\innosetup.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\is.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\java.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\lisp.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\Externals\crystaledit\editlib\lua.cpp">
-      <Filter>EditLib\parsers</Filter>
+      <Filter>EditLib\Parsers\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="MergeEditFrm.cpp">
-      <Filter>MFCGui\Source Files</Filter>
+    <ClCompile Include="..\Externals\crystaledit\editlib\nsis.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\pascal.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\perl.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\php.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\plain.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\po.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\powershell.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\python.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\rexx.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\rsrc.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\ruby.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\rust.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\sgml.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\sh.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\siod.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\sql.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\tcl.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\tex.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\verilog.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\vhdl.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Externals\crystaledit\editlib\xml.cpp">
+      <Filter>EditLib\Parsers\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CompareEngines\BinaryCompare.cpp">
+      <Filter>Compare Engines\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CompareEngines\ByteComparator.cpp">
+      <Filter>Compare Engines\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CompareEngines\ByteCompare.cpp">
+      <Filter>Compare Engines\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">
+      <Filter>Compare Engines\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">
+      <Filter>Compare Engines\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\VersionInfo.cpp">
+      <Filter>Common\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\ShellContextMenu.cpp">
+      <Filter>Common\Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -807,9 +852,6 @@
     <ClInclude Include="ConflictFileParser.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\coretools.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="DiffContext.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -906,9 +948,6 @@
     <ClInclude Include="locality.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\lwdisp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="markdown.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -918,15 +957,9 @@
     <ClInclude Include="MovedLines.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\multiformatText.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="OptionsDef.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="common\OptionsMgr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="PatchHTML.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -936,9 +969,6 @@
     <ClInclude Include="paths.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\PidlContainer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="PluginManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -948,15 +978,6 @@
     <ClInclude Include="ProjectFile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\RegKey.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\RegOptionsMgr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\ShellFileOperations.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="stringdiffs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -966,21 +987,9 @@
     <ClInclude Include="TempFile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\unicoder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\UnicodeString.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\UniFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="UniMarkdownFile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\varprop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="diffutils\lib\cmpbuf.h">
       <Filter>GNU diffutils</Filter>
     </ClInclude>
@@ -993,93 +1002,6 @@
     <ClInclude Include="diffutils\src\system.h">
       <Filter>GNU diffutils</Filter>
     </ClInclude>
-    <ClInclude Include="CompareEngines\ByteComparator.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\ByteCompare.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareEngines\TimeSizeCompare.h">
-      <Filter>Compare Engines</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\registry.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">
-      <Filter>EditLib</Filter>
-    </ClInclude>
     <ClInclude Include="StdAfx.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
@@ -1146,311 +1068,434 @@
     <ClInclude Include="DirDoc.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DirFrame.h">
+    <ClInclude Include="DirFrame.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DirView.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="EditorFilepathBar.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="EncodingErrorBar.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FileActionScript.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FilepathEdit.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IListCtrlImpl.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MergeLineFlags.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MergeApp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DirCompProgressBar.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Diff3.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsFont.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsSyntaxColors.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsDiffColors.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsDiffOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PatchTool.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="JumpList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsCustomColors.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="7zCommon.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ImgMergeFrm.h">
+      <Filter>MFCGui\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IMergeDoc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Merge7zFormatMergePluginImpl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Merge7zFormatRegister.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DirViewColItems.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DirActions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="HexMergeView.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DirView.h">
+    <ClInclude Include="OptionsPanel.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="EditorFilepathBar.h">
+    <ClInclude Include="DropHandler.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="EncodingErrorBar.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="Constants.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="FileActionScript.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="OptionsInit.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="FilepathEdit.h">
+    <ClInclude Include="TrDialogs.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\LanguageSelect.h">
+    <ClInclude Include="MergeStatusBar.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="IListCtrlImpl.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="..\Externals\boost\boost\config.hpp">
+      <Filter>Boost</Filter>
     </ClInclude>
-    <ClInclude Include="MergeLineFlags.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp">
+      <Filter>Boost\config\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="MergeApp.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp">
+      <Filter>Boost\config</Filter>
     </ClInclude>
-    <ClInclude Include="Common\ExConverter.h">
+    <ClInclude Include="..\Version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DirCompProgressBar.h">
+    <ClInclude Include="MergeEditSplitterView.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Diff3.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="TestMain.h">
+      <Filter>MergeTest</Filter>
     </ClInclude>
-    <ClInclude Include="OptionsFont.h">
+    <ClInclude Include="Win_VersionHelper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OptionsSyntaxColors.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">
+      <Filter>MergeTest\gtest</Filter>
     </ClInclude>
-    <ClInclude Include="OptionsDiffColors.h">
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest-printers.h">
+      <Filter>MergeTest\gtest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Externals\gtest\include\gtest\internal\gtest-port.h">
+      <Filter>MergeTest\gtest</Filter>
+    </ClInclude>
+    <ClInclude Include="Merge7zFormatShellImpl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OptionsDiffOptions.h">
+    <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropArchive.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="MergeEditFrm.h">
+      <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropBackups.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\BCMenu.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropCodepage.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\Bitmap.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\CMoveConstraint.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropCompare.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\ColorButton.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropCompareFolder.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\LanguageSelect.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropEditor.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\MDITabBar.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropGeneral.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\memdc.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropRegistry.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\MessageBoxDialog.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropShell.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\Picture.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropSyntaxColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\scbarcf.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropTextColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\PropertyPageHost.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\scbarg.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\sizecbar.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\SortHeaderCtrl.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\SplitterWndEx.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\SuperComboBox.h">
+      <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="AboutDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="CompareStatisticsDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="ConfirmFolderCopyDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="DirCmpReportDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="FileFiltersDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClInclude Include="DirColsDlg.h">
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="LoadSaveCodepageDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClInclude Include="FileFiltersDlg.h">
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="LineFiltersDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LoadSaveCodepageDlg.h">
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="PatchDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="PluginsListDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\PreferencesDlg.h">
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="SaveClosingDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="SelectUnpackerDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="SharedFilterDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="TestFilterDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="WMGotoDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="DirColsDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+      <Filter>MFCGui\Dialogs\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PatchTool.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="PropArchive.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\PreferencesDlg.h">
-      <Filter>MFCGui\Dialogs</Filter>
+    <ClInclude Include="PropBackups.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="JumpList.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropCodepage.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\ClipBoard.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropColors.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OptionsCustomColors.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropCompare.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="7zCommon.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="PropCompareBinary.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ImgMergeFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="PropCompareFolder.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="PropCompareImage.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="IMergeDoc.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropEditor.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Merge7zFormatMergePluginImpl.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropGeneral.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Merge7zFormatRegister.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropMarkerColors.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CompareEngines\BinaryCompare.h">
-      <Filter>Compare Engines</Filter>
+    <ClInclude Include="PropRegistry.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DirViewColItems.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropShell.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DirActions.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PropSyntaxColors.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="HexMergeView.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="PropTextColors.h">
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropCompareBinary.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="Common\ClipBoard.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\SuperComboBox.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\coretools.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\SortHeaderCtrl.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\lwdisp.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\CMoveConstraint.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\ExConverter.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\MDITabBar.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\UniFile.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\PropertyPageHost.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\UnicodeString.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\SplitterWndEx.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\unicoder.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\sizecbar.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\ShellFileOperations.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\scbarg.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\RegOptionsMgr.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\scbarcf.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\RegKey.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\MessageBoxDialog.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\PidlContainer.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OptionsPanel.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="common\OptionsMgr.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\Bitmap.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\varprop.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\memdc.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="Common\multiformatText.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\ShellContextMenu.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\BCMenu.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\ColorButton.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\Picture.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DropHandler.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\ceditreplacedlg.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Constants.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\cfindtextdlg.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OptionsInit.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\cregexp.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TrDialogs.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\chcondlg.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MergeStatusBar.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">
-      <Filter>EditLib</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PropMarkerColors.h">
-      <Filter>MFCGui\Dialogs\PropertyPages</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h">
+      <Filter>EditLib\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Externals\crystaledit\editlib\cs2cs.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\Externals\crystaledit\editlib\ctextmarkerdlg.h">
-      <Filter>EditLib</Filter>
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Externals\boost\boost\config.hpp">
-      <Filter>Boost</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp">
-      <Filter>Boost\config\compiler</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp">
-      <Filter>Boost\config</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Version.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\filesup.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Common\VersionInfo.h">
-      <Filter>MFCGui\Common</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\fpattern.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MergeEditSplitterView.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\gotodlg.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">
-      <Filter>Compare Engines</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TestMain.h">
-      <Filter>MergeTest</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\memcombo.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Win_VersionHelper.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\registry.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">
-      <Filter>MergeTest\gtest</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\statbar.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Externals\gtest\include\gtest\gtest-printers.h">
-      <Filter>MergeTest\gtest</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\string_util.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Externals\gtest\include\gtest\internal\gtest-port.h">
-      <Filter>MergeTest\gtest</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Merge7zFormatShellImpl.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h">
+      <Filter>EditLib\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\Externals\crystaledit\editlib\wcwidth.h">
-      <Filter>EditLib</Filter>
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h">
+      <Filter>EditLib\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\Externals\crystaledit\editlib\crystallineparser.h">
-      <Filter>EditLib\parsers</Filter>
+      <Filter>EditLib\Parsers\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MergeEditFrm.h">
-      <Filter>MFCGui\Header Files</Filter>
+    <ClInclude Include="CompareEngines\BinaryCompare.h">
+      <Filter>Compare Engines\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CompareEngines\ByteComparator.h">
+      <Filter>Compare Engines\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CompareEngines\ByteCompare.h">
+      <Filter>Compare Engines\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CompareEngines\TimeSizeCompare.h">
+      <Filter>Compare Engines\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">
+      <Filter>Compare Engines\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\VersionInfo.h">
+      <Filter>Common\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common\ShellContextMenu.h">
+      <Filter>Common\Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>