diff --git a/Ide/win/LgiIde.vcxproj b/Ide/win/LgiIde.vcxproj
--- a/Ide/win/LgiIde.vcxproj
+++ b/Ide/win/LgiIde.vcxproj
@@ -1,278 +1,278 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>LgiIde</ProjectName>
     <ProjectGuid>{967AF7EF-7C17-4FCC-997E-BED17F886F07}</ProjectGuid>
     <RootNamespace>LgiIde_vc8</RootNamespace>
     <Keyword>Win32Proj</Keyword>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(Platform)$(Configuration)14\</OutDir>
     <IntDir>$(Platform)$(Configuration)14\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\..\..\CodeLib\libpng-1.6.26</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(Platform)$(Configuration)14\</OutDir>
     <IntDir>$(Platform)$(Configuration)14\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\..\..\CodeLib\libpng-1.6.26</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(Platform)$(Configuration)14\</OutDir>
     <IntDir>$(Platform)$(Configuration)14\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\..\..\CodeLib\libpng-1.6.26</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(Platform)$(Configuration)14\</OutDir>
     <IntDir>$(Platform)$(Configuration)14\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\..\..\CodeLib\libpng-1.6.26</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\..\include\lgi\win;..\..\..\..\..\CodeLib\zlib;..\..\..\..\..\CodeLib\libpng;..\..\..\..\..\CodeLib\libpng\win32;..\..\..\..\..\CodeLib\zlib\win32;..\resources;C:\Program Files (x86)\OpenSSL-Win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level2</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;Mincore.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\..\include\lgi\win;..\..\..\..\..\CodeLib\zlib;..\..\..\..\..\CodeLib\libpng;..\..\..\..\..\CodeLib\libpng\win32;..\..\..\..\..\CodeLib\zlib\win32;..\resources;C:\Program Files\OpenSSL-Win64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level2</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>..\..\src\win\General\Lgi.manifest</AdditionalManifestFiles>
     </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include;..\..\include\lgi\win;..\..\..\..\..\CodeLib\zlib;..\..\..\..\..\CodeLib\libpng;..\..\..\..\..\CodeLib\libpng\win32;..\..\..\..\..\CodeLib\zlib\win32;.\Resources;C:\Program Files (x86)\OpenSSL-Win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level2</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;Mincore.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;..\..\include\lgi\win;..\..\..\..\..\CodeLib\zlib;..\..\..\..\..\CodeLib\libpng;..\..\..\..\..\CodeLib\libpng\win32;..\..\..\..\..\CodeLib\zlib\win32;.\Resources;C:\Program Files\OpenSSL-Win64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\..\include\lgi\win;..\..\..\..\..\CodeLib\zlib;..\..\..\..\..\CodeLib\libpng;..\..\..\..\..\CodeLib\libpng\win32;..\..\..\..\..\CodeLib\zlib\win32;..\resources;C:\Program Files\OpenSSL-Win64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level2</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>..\..\src\win\General\Lgi.manifest</AdditionalManifestFiles>
     </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\include\common\EventTargetThread.h" />
     <ClInclude Include="..\..\..\include\common\ParseCpp.h" />
     <ClInclude Include="..\..\..\include\common\Scripting.h" />
     <ClInclude Include="..\..\..\include\common\SubProcess.h" />
     <ClInclude Include="..\..\src\common\Coding\ScriptingPriv.h" />
     <ClInclude Include="..\Code\AddFtpFile.h" />
     <ClInclude Include="..\Code\FindInFiles.h" />
     <ClInclude Include="..\Code\FindSymbol.h" />
     <ClInclude Include="..\Code\FtpFile.h" />
     <ClInclude Include="..\Code\FtpThread.h" />
     <ClInclude Include="..\Code\Debugger.h" />
     <ClInclude Include="..\Code\IdeDoc.h" />
     <ClInclude Include="..\Code\IdeDocPrivate.h" />
     <ClInclude Include="..\Code\IdeProject.h" />
     <ClInclude Include="..\Code\LgiIde.h" />
     <ClInclude Include="..\Code\ProjectNode.h" />
     <ClInclude Include="..\Code\PythonParser.h" />
     <ClInclude Include="..\Code\resdefs.h" />
     <ClInclude Include="..\Code\resource.h" />
     <ClInclude Include="..\Code\SimpleCppParser.h" />
     <ClInclude Include="..\Code\SpaceTabConv.h" />
     <ClInclude Include="..\Code\WebFldDlg.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\common\Coding\LexCpp.cpp" />
     <ClCompile Include="..\..\src\common\Coding\ParseCpp.cpp" />
     <ClCompile Include="..\..\src\common\Coding\ScriptCompiler.cpp" />
     <ClCompile Include="..\..\src\common\Coding\ScriptLibrary.cpp" />
     <ClCompile Include="..\..\src\common\Coding\ScriptVM.cpp" />
     <ClCompile Include="..\..\src\common\Gdc2\Filters\Png.cpp" />
     <ClCompile Include="..\..\src\common\Net\Ftp.cpp" />
     <ClCompile Include="..\..\src\common\Net\Http.cpp" />
     <ClCompile Include="..\..\src\common\Net\OpenSSLSocket.cpp" />
     <ClCompile Include="..\..\src\common\Lgi\About.cpp" />
     <ClCompile Include="..\..\src\common\Lgi\Mdi.cpp" />
     <ClCompile Include="..\..\src\common\Lgi\LgiMain.cpp" />
     <ClCompile Include="..\src\AddFtpFile.cpp" />
     <ClCompile Include="..\src\DocEdit.cpp" />
     <ClCompile Include="..\src\DocEditStyling.cpp" />
     <ClCompile Include="..\src\FindInFiles.cpp" />
     <ClCompile Include="..\src\FindSymbol.cpp" />
     <ClCompile Include="..\src\FtpThread.cpp" />
     <ClCompile Include="..\src\DebugContext.cpp" />
     <ClCompile Include="..\src\Debugger.cpp" />
     <ClCompile Include="..\src\History.cpp" />
     <ClCompile Include="..\src\IdeCommon.cpp" />
     <ClCompile Include="..\src\IdeDoc.cpp" />
     <ClCompile Include="..\src\IdeProject.cpp" />
     <ClCompile Include="..\src\IdeProjectSettings.cpp" />
     <ClCompile Include="..\src\JavascriptParser.cpp" />
     <ClCompile Include="..\src\LgiIde.cpp" />
     <ClCompile Include="..\src\LgiUtils.cpp" />
     <ClCompile Include="..\src\MemDumpViewer.cpp" />
     <ClCompile Include="..\src\MissingFiles.cpp" />
     <ClCompile Include="..\src\NewProjectFromTemplate.cpp" />
     <ClCompile Include="..\src\ProjectNode.cpp" />
     <ClCompile Include="..\src\PythonParser.cpp" />
     <ClCompile Include="..\src\SimpleCppParser.cpp" />
     <ClCompile Include="..\src\SpaceTabConv.cpp" />
     <ClCompile Include="..\src\SysCharSupport.cpp" />
     <ClCompile Include="..\src\WebFldDlg.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Manifest Include="..\..\src\win\General\Lgi.manifest" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\resources\Script1.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Lgi_vs2019.vcxproj">
       <Project>{95df9ca4-6d37-4a85-a648-80c2712e0da1}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <MASM Include="..\..\src\common\Coding\ExternCall.asm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </MASM>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Lvc/CMakeLists.txt b/Lvc/CMakeLists.txt
--- a/Lvc/CMakeLists.txt
+++ b/Lvc/CMakeLists.txt
@@ -1,66 +1,67 @@
 
 set(APP_RESOURCES
     Resources/Lvc.lr8
     Resources/image-list.png)
 set(APP_MANIFEST)
 if (WIN32)
 	set(APP_TYPE WIN32)
 	set(APP_ICON resources/Lvc.rc)
 	set(APP_MANIFEST ../src/win/General/Lgi.manifest)
 elseif (APPLE)
 	set(APP_TYPE MACOSX_BUNDLE)
 	set(APP_ICON Resources/mac-icon.icns)
 	set_source_files_properties(
         ${APP_ICON}
         ${APP_RESOURCES}
 		PROPERTIES
 			MACOSX_PACKAGE_LOCATION "Resources")
 elseif (LINUX)
 	set(APP_ICON Resources/icon128.png)
 endif()
 
 if (NOT TARGET ssh_shared)
     get_filename_component(LIBSSH_DIR "${CODELIB}/libssh" ABSOLUTE)
     if (EXISTS ${LIBSSH_DIR})
         add_subdirectory(${LIBSSH_DIR} libssh)
     else()
         find_path(LIBSSH_INCLUDE_DIR libssh.h PATH /usr/include/libssh)
         if (NOT LIBSSH_INCLUDE_DIR)
             message(FATAL_ERROR "libssh not found.")
         endif()
         add_library(ssh_shared INTERFACE)
         set_target_properties(ssh_shared
             PROPERTIES
                 INTERFACE_INCLUDE_DIRECTORIES ${LIBSSH_INCLUDE_DIR}
                 INTERFACE_LINK_LIBRARIES "ssh")
     endif()
 endif()
 
 add_executable(Lvc ${APP_TYPE}
     ../src/common/Gdc2/Filters/Png.cpp
     ../src/common/Lgi/LgiMain.cpp
     ../src/common/Text/DeEscape.cpp
     ../src/common/Text/XmlTreeUi.cpp
     ../src/common/Widgets/ControlTree.cpp
     Src/BlameUi.cpp
     Src/DropDownBtn.cpp
     Src/Main.cpp
     Src/SshConnection.cpp
     Src/VcCommit.cpp
     Src/VcFile.cpp
     Src/VcFolder.cpp
     Src/PatchViewer.cpp
 	${APP_ICON}
     ${APP_RESOURCES}
 	${APP_MANIFEST}
 	)
 
 target_link_libraries(Lvc lgi libpng16 ssh_shared)
+target_include_directories(Lvc PUBLIC resources)
 
 if (APPLE)
     macBundlePostBuild(Lvc)
 else()
     file(COPY ${CMAKE_CURRENT_LIST_DIR}/Resources DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 endif()
 
 set_target_properties(Lvc PROPERTIES EXCLUDE_FROM_ALL TRUE)
\ No newline at end of file
diff --git a/Lvc/win/Lvc.vcxproj b/Lvc/win/Lvc.vcxproj
--- a/Lvc/win/Lvc.vcxproj
+++ b/Lvc/win/Lvc.vcxproj
@@ -1,218 +1,218 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{28000ACC-67F6-4A82-B779-A24F065FACF4}</ProjectGuid>
     <RootNamespace>Lvc</RootNamespace>
     <Keyword>Win32Proj</Keyword>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(Platform)$(Configuration)14\</OutDir>
     <IntDir>$(Platform)$(Configuration)14\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(Platform)$(Configuration)14\</OutDir>
     <IntDir>$(Platform)$(Configuration)14\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(Platform)$(Configuration)14\</OutDir>
     <IntDir>$(Platform)$(Configuration)14\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(Platform)$(Configuration)14\</OutDir>
     <IntDir>$(Platform)$(Configuration)14\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include\common;..\..\include\win32;Src;..\..\..\..\..\CodeLib\libpng\build32;..\..\..\..\..\CodeLib\libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\..\CodeLib\libssh\include;..\..\include;..\..\include\lgi\win;Src;..\..\..\..\..\CodeLib\libpng;..\..\..\..\..\CodeLib\libpng\build64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src;..\resources;..\..\include;..\..\include\lgi\win;..\..\..\..\..\CodeLib\libssh\include;..\..\..\..\..\CodeLib\libpng;..\..\..\..\..\CodeLib\libpng\build64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ssh.lib;imm32.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <AdditionalLibraryDirectories>..\..\..\..\..\CodeLib\libssh\build64\src\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include\common;..\..\include\win32;Src;..\..\..\..\..\CodeLib\libpng\build32;..\..\..\..\..\CodeLib\libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\CodeLib\libssh\include;..\..\include;..\..\include\lgi\win;Src;..\..\..\..\..\CodeLib\libpng;..\..\..\..\..\CodeLib\libpng\build64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src;..\resources;..\..\include;..\..\include\lgi\win;..\..\..\..\..\CodeLib\libssh\include;..\..\..\..\..\CodeLib\libpng;..\..\..\..\..\CodeLib\libpng\build64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ssh.lib;imm32.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <AdditionalLibraryDirectories>..\..\..\..\..\CodeLib\libssh\build64\src\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\common\Gdc2\Filters\Png.cpp" />
     <ClCompile Include="..\..\src\common\Lgi\LgiMain.cpp" />
     <ClCompile Include="..\..\src\common\Text\DeEscape.cpp" />
     <ClCompile Include="..\..\src\common\Text\XmlTreeUi.cpp" />
     <ClCompile Include="..\..\src\common\Widgets\ControlTree.cpp" />
     <ClCompile Include="..\Src\BlameUi.cpp" />
     <ClCompile Include="..\Src\DropDownBtn.cpp" />
     <ClCompile Include="..\Src\Main.cpp" />
     <ClCompile Include="..\Src\PatchViewer.cpp" />
     <ClCompile Include="..\Src\SshConnection.cpp" />
     <ClCompile Include="..\Src\VcCommit.cpp" />
     <ClCompile Include="..\Src\VcFile.cpp" />
     <ClCompile Include="..\Src\VcFolder.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Manifest Include="..\..\src\win\General\Lgi.manifest" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\lgi\common\StructuredIo.h" />
     <ClInclude Include="..\..\include\lgi\common\StructuredLog.h" />
     <ClInclude Include="..\Src\Lvc.h" />
     <ClInclude Include="..\Src\SshConnection.h" />
     <ClInclude Include="..\Src\VcCommit.h" />
     <ClInclude Include="..\Src\VcFile.h" />
     <ClInclude Include="..\Src\VcFolder.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\resources\icon32.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\resources\Lvc.rc" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\installer-zip.py" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Lgi_vs2019.vcxproj">
       <Project>{95df9ca4-6d37-4a85-a648-80c2712e0da1}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Lvc/win/Lvc.vcxproj.filters b/Lvc/win/Lvc.vcxproj.filters
--- a/Lvc/win/Lvc.vcxproj.filters
+++ b/Lvc/win/Lvc.vcxproj.filters
@@ -1,104 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
     <Filter Include="Source Files\Lgi">
       <UniqueIdentifier>{fa200907-15ff-4b7a-a2c4-77c17b81b307}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resources">
       <UniqueIdentifier>{ceabde46-f0f5-4728-929b-43ebf21b9fa0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\StructuredLog">
       <UniqueIdentifier>{699395fd-5c52-485b-aee9-12ca42fecba2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Ssh">
       <UniqueIdentifier>{954c3d3b-a151-4c83-b7cc-c36301353e1b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\PatchViewer">
       <UniqueIdentifier>{9ebbbfd3-1106-4ecf-b05d-f0366063de49}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\common\Lgi\LgiMain.cpp">
-      <Filter>Source Files\Lgi</Filter>
+    <ClCompile Include="..\..\src\common\Gdc2\Filters\Png.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VcCommit.cpp">
+    <ClCompile Include="..\..\src\common\Lgi\LgiMain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VcFolder.cpp">
+    <ClCompile Include="..\..\src\common\Text\DeEscape.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Src\Main.cpp">
+    <ClCompile Include="..\..\src\common\Text\XmlTreeUi.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Src\VcFile.cpp">
+    <ClCompile Include="..\..\src\common\Widgets\ControlTree.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Src\BlameUi.cpp">
+    <ClCompile Include="..\Src\BlameUi.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\Filters\Png.cpp">
-      <Filter>Source Files\Lgi</Filter>
+    <ClCompile Include="..\Src\DropDownBtn.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Text\DeEscape.cpp">
-      <Filter>Source Files\Lgi</Filter>
+    <ClCompile Include="..\Src\Main.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\ControlTree.cpp">
-      <Filter>Source Files\Lgi</Filter>
+    <ClCompile Include="..\Src\PatchViewer.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Src\DropDownBtn.cpp">
-      <Filter>Source Files\Lgi</Filter>
+    <ClCompile Include="..\Src\SshConnection.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Text\XmlTreeUi.cpp">
-      <Filter>Source Files\Lgi</Filter>
+    <ClCompile Include="..\Src\VcCommit.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Src\SshConnection.cpp">
-      <Filter>Source Files\Ssh</Filter>
+    <ClCompile Include="..\Src\VcFile.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Src\PatchViewer.cpp">
-      <Filter>Source Files\PatchViewer</Filter>
+    <ClCompile Include="..\Src\VcFolder.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Manifest Include="..\src\win\General\Lgi.manifest" />
+    <Manifest Include="..\..\src\win\General\Lgi.manifest" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\VcCommit.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Lvc.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VcFolder.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VcFile.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\lgi\common\StructuredLog.h">
-      <Filter>Source Files\StructuredLog</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\lgi\common\StructuredIo.h">
-      <Filter>Source Files\StructuredLog</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\SshConnection.h">
-      <Filter>Source Files\Ssh</Filter>
-    </ClInclude>
+    <ClInclude Include="..\..\include\lgi\common\StructuredIo.h" />
+    <ClInclude Include="..\..\include\lgi\common\StructuredLog.h" />
+    <ClInclude Include="..\Src\Lvc.h" />
+    <ClInclude Include="..\Src\SshConnection.h" />
+    <ClInclude Include="..\Src\VcCommit.h" />
+    <ClInclude Include="..\Src\VcFile.h" />
+    <ClInclude Include="..\Src\VcFolder.h" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="Resources\icon32.ico" />
+    <Image Include="..\resources\icon32.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Resources\Lvc.rc">
-      <Filter>Resources</Filter>
-    </ResourceCompile>
+    <ResourceCompile Include="..\resources\Lvc.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="installer-zip.py">
-      <Filter>Resources</Filter>
-    </None>
+    <None Include="..\installer-zip.py" />
   </ItemGroup>
 </Project>
\ No newline at end of file