diff --git a/build/AgaLib01.vcxproj b/build/AgaLib01.vcxproj
index 5ab27851e..d821b5c33 100644
--- a/build/AgaLib01.vcxproj
+++ b/build/AgaLib01.vcxproj
@@ -80,7 +80,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\cb\source;..\libraries\SQLAPI\include;..\src\xvaga;..\src\xi;..\src\gfm;..\src\include01;..\src\xvtdb;..\src\xvturl</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\cb\source;..\libraries\SQLAPI\include;..\src\xvaga01;..\src\xi;..\src\gfm;..\src\include01;..\src\xvtdb;..\src\xvturl</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -760,9 +760,6 @@
     <ProjectReference Include="xvtdb.vcxproj">
       <Project>{9c91bacf-9a70-4973-b8cc-fa3d2af9867c}</Project>
     </ProjectReference>
-    <ProjectReference Include="xvturl.vcxproj">
-      <Project>{50f46f99-bd70-4bb3-ba95-7ae2baf35234}</Project>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\src\include01\alex.alx" />
diff --git a/build/agalib01.sln b/build/agalib01.sln
index 72fef1966..a069fe0ef 100644
--- a/build/agalib01.sln
+++ b/build/agalib01.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 15.0.27004.2002
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib01", "AgaLib01.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xi", "xi.vcxproj", "{3A5B0119-6DAD-4407-9EE1-3B739B0581E8}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvaga01", "xvaga01.vcxproj", "{4A2FC619-2461-4F58-8F1D-92FA153E39A2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvtdb", "xvtdb.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}"
@@ -25,6 +23,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdflibwrap", "pdflibwrap.vc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Uno", "Uno.vcxproj", "{8B0477F1-5D74-46C3-97B6-8879E2460A71}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xi01", "xi01.vcxproj", "{3A5B0119-6DAD-4407-9EE1-3B739B0581E8}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvapp01", "xvapp01.vcxproj", "{153C04B0-1F72-4DA9-8AC1-7DF76FFACFD2}"
 EndProject
 Global
diff --git a/build/cg01.sln b/build/cg01.sln
index b3be51d38..130bac9bd 100644
--- a/build/cg01.sln
+++ b/build/cg01.sln
@@ -28,8 +28,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fplib01", "fplib01.vcxproj"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc01", "vedoc01.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvaga", "xvaga.vcxproj", "{4A2FC619-2461-4F58-8F1D-92FA153E39A2}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib01", "cglib01.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext01", "vedocext01.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}"
@@ -38,6 +36,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cg016", "Cg016.vcxproj", "{
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib01", "lilib01.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvaga01", "xvaga01.vcxproj", "{4A2FC619-2461-4F58-8F1D-92FA153E39A2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -88,10 +88,6 @@ Global
 		{A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32
 		{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32
 		{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32
-		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Debug|Win32.Build.0 = Debug|Win32
-		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Release|Win32.ActiveCfg = Release|Win32
-		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Release|Win32.Build.0 = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
@@ -108,6 +104,10 @@ Global
 		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.Build.0 = Debug|Win32
 		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.ActiveCfg = Release|Win32
 		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.Build.0 = Release|Win32
+		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Debug|Win32.Build.0 = Debug|Win32
+		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Release|Win32.ActiveCfg = Release|Win32
+		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/build/fp010.vcxproj b/build/fp010.vcxproj
index a17a7eec7..4cc4756c3 100644
--- a/build/fp010.vcxproj
+++ b/build/fp010.vcxproj
@@ -142,6 +142,8 @@
       <Version>12.0</Version>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/cd/test/cg1394.txt b/cd/test/cg1394.txt
new file mode 100644
index 000000000..56690e148
--- /dev/null
+++ b/cd/test/cg1394.txt
@@ -0,0 +1 @@
+cg012.exe
diff --git a/cd/test/cg1394a.ini b/cd/test/cg1394a.ini
new file mode 100644
index 000000000..634623872
--- /dev/null
+++ b/cd/test/cg1394a.ini
@@ -0,0 +1,98 @@
+[Main]
+Demo=0
+[cg1]
+File(12) = cg012.exe|X
+Patch = 1394
+Versione = 21511200
+
+[cg99]
+Kill(0) = bastcfi.rep|x
+Kill(1) = batbcve.msk|x
+Kill(2) = batbtra.msk|x
+Kill(3) = bastcam.rep|x
+Kill(4) = batbdpn.msk|x
+Kill(5) = bastver.msk|x
+Kill(6) = bastvet.rep|x
+Kill(7) = batbarb.msk|x
+Kill(8) = bastarb.msk|x
+Kill(9) = batbtit.msk|x
+Kill(10) = batbcam.msk|x
+Kill(11) = batblia.msk|x
+Kill(12) = bastcve.rep|x
+Kill(13) = bastcco.msk|x
+Kill(14) = batbscc.msk|x
+Kill(15) = batbivd.msk|x
+Kill(16) = batbleg.msk|x
+Kill(17) = bastivd.rep|x
+Kill(18) = bastpdb.msk|x
+Kill(19) = bastntb.rep|x
+Kill(20) = batbind.msk|x
+Kill(21) = bastleg.rep|x
+Kill(22) = batbreg.msk|x
+Kill(23) = bastscc.msk|x
+Kill(24) = batbpor.msk|x
+Kill(25) = bastvet.msk|x
+Kill(26) = batbinl.msk|x
+Kill(27) = batbnot.msk|x
+Kill(28) = batblia.msk|x
+Kill(29) = bastarb.rep|x
+Kill(30) = bastndo.rep|x
+Kill(31) = bastmsp.msk|x
+Kill(32) = bastcco.rep|x
+Kill(33) = bastcve.msk|x
+Kill(34) = cg2fppro.msk|x
+Kill(35) = batbdel.msk|x
+Kill(36) = batbzon.msk|x
+Kill(37) = bastcam.msk|x
+Kill(38) = batblbu.msk|x
+Kill(39) = bastver.rep|x
+Kill(40) = bastpdb.rep|x
+Kill(41) = bastntb.msk|x
+Kill(42) = bastivd.msk|x
+Kill(43) = bastdpn.msk|x
+Kill(44) = bastesc.rep|x
+Kill(45) = cgtbcon.msk|x
+Kill(46) = bastzon.msk|x
+Kill(47) = bastzon.rep|x
+Kill(48) = bastnot.msk|x
+Kill(49) = bastndo.msk|x
+Kill(50) = bastdpn.rep|x
+Kill(51) = batbmsp.msk|x
+Kill(52) = batbcco.msk|x
+Kill(53) = bastleg.msk|x
+Kill(54) = bastscc.rep|x
+Kill(55) = batbins.msk|x
+Kill(56) = batbpdb.msk|x
+Kill(57) = bastreg.rep|x
+Kill(58) = batbvet.msk|x
+Kill(59) = batbcfi.msk|x
+Kill(60) = bastesc.msk|x
+Kill(61) = bastpor.msk|x
+Kill(62) = bastcfi.msk|x
+Kill(63) = bastnot.rep|x
+Kill(64) = batbesc.msk|x
+Kill(65) = bastpor.rep|x
+Kill(66) = batbntb.msk|x
+Kill(67) = batbver.msk|x
+Kill(68) = bastmsp.rep|x
+Kill(69) = batbndo.msk|x
+Kill(70) = bastreg.msk|x
+
+[cg]
+Data = 10-06-2025
+Descrizione = Contabilita' Generale
+Dischi = 1
+Edit_19 = cg0 -0
+Edit_20 = cg0 -1
+Edit_26 = cg0 -4
+Edit_5 = cg0 -5
+Moduli = ba
+OE333M = 
+OEM = 
+Patch = 1394
+PostProcess = bainst -0 CG
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/cg1394a1.zip b/cd/test/cg1394a1.zip
new file mode 100644
index 000000000..a849325d6
Binary files /dev/null and b/cd/test/cg1394a1.zip differ
diff --git a/cd/test/fp1394.txt b/cd/test/fp1394.txt
new file mode 100644
index 000000000..50a8fbe1b
--- /dev/null
+++ b/cd/test/fp1394.txt
@@ -0,0 +1,10 @@
+fp0200a01.msk
+fp0300a01.msk
+fp0700a01.msk
+fp0400a01.msk
+fp1100a01.msk
+fp1200a01.msk
+fp010.exe
+fp0100a01.msk
+fp011.exe
+fpmenuf.men
diff --git a/cd/test/fp1394a.ini b/cd/test/fp1394a.ini
new file mode 100644
index 000000000..fa79ceb92
--- /dev/null
+++ b/cd/test/fp1394a.ini
@@ -0,0 +1,27 @@
+[Main]
+Demo=0
+[fp1]
+File(10) = fp010.exe|X
+File(11) = fp0100a01.msk|X
+File(12) = fp011.exe|X
+File(14) = fp0200a01.msk|X
+File(15) = fp0300a01.msk|X
+File(16) = fp0400a01.msk|X
+File(21) = fp0700a01.msk|X
+File(25) = fp1100a01.msk|X
+File(27) = fp1200a01.msk|X
+File(29) = fpmenuf.men|X
+Patch = 1394
+Versione = 21511200
+
+[fp]
+Data = 10-06-2025
+Descrizione = Fattura Elettronica
+Dischi = 1
+Moduli = cg,ve
+OEM = 
+Patch = 1394
+PostProcess = 
+PreProcess = 
+Versione = 21511200
+
diff --git a/cd/test/fp1394a1.zip b/cd/test/fp1394a1.zip
new file mode 100644
index 000000000..0c71727c2
Binary files /dev/null and b/cd/test/fp1394a1.zip differ
diff --git a/cd/test/ve1394.txt b/cd/test/ve1394.txt
new file mode 100644
index 000000000..a76245915
--- /dev/null
+++ b/cd/test/ve1394.txt
@@ -0,0 +1,3 @@
+ve1300af.msk
+ve011.exe
+ve010.exe
diff --git a/cd/test/ve1394a.ini b/cd/test/ve1394a.ini
new file mode 100644
index 000000000..86a7f6576
--- /dev/null
+++ b/cd/test/ve1394a.ini
@@ -0,0 +1,130 @@
+[Main]
+Demo=0
+[ve1]
+File(273) = ve010.exe|X
+File(274) = ve011.exe|X
+File(275) = ve1300af.msk|X
+Patch = 1394
+Versione = 21511200
+
+[ve99]
+Kill(0) = batbimb.msk|x
+Kill(1) = batbacr.msk|x
+Kill(2) = basttag.msk|x
+Kill(3) = bastbnp.rep|x
+Kill(4) = ve7100a.msk|x
+Kill(5) = ve7600a.msk|x
+Kill(6) = efstbnp.rep|x
+Kill(7) = bastcra.rep|x
+Kill(8) = bastctr.rep|x
+Kill(9) = bastgcg.rep|x
+Kill(10) = batbprv.msk|x
+Kill(11) = batbmre.msk|x
+Kill(12) = batbnum.msk|x
+Kill(13) = bastabe.rep|x
+Kill(14) = bastcaa.msk|x
+Kill(15) = batbcaa.msk|x
+Kill(16) = bastgcg.msk|x
+Kill(17) = batbtip.msk|x
+Kill(18) = eftbbnp.msk|x
+Kill(19) = batbfrm.msk|x
+Kill(20) = batbfca.msk|x
+Kill(21) = bastspp.msk|x
+Kill(22) = ve7400conf.ini|x
+Kill(23) = baststd.rep|x
+Kill(24) = basteld.rep|x
+Kill(25) = bastfrm.rep|x
+Kill(26) = bastrfa.rep|x
+Kill(27) = ve7300a.msk|x
+Kill(28) = bastprs.msk|x
+Kill(29) = batbtag.msk|x
+Kill(30) = bastrfc.msk|x
+Kill(31) = bastimb.msk|x
+Kill(32) = bastrfc.rep|x
+Kill(33) = batbabe.msk|x
+Kill(34) = bastgmc.msk|x
+Kill(35) = batbums.msk|x
+Kill(36) = bastcau.msk|x
+Kill(37) = basttag.rep|x
+Kill(38) = batbfrr.msk|x
+Kill(39) = bastasf.rep|x
+Kill(40) = bastasf.msk|x
+Kill(41) = bastgca.msk|x
+Kill(42) = ve7400a.ini|x
+Kill(43) = bastcaa.rep|x
+Kill(44) = batbgmc.msk|x
+Kill(45) = batbasf.msk|x
+Kill(46) = bastnum.rep|x
+Kill(47) = batbfsa.msk|x
+Kill(48) = ve7400a.msk|x
+Kill(49) = bastfrd.msk|x
+Kill(50) = batbfrd.msk|x
+Kill(51) = batbgcg.msk|x
+Kill(52) = basttri.msk|x
+Kill(53) = batbgsa.msk|x
+Kill(54) = batbrfa.msk|x
+Kill(55) = bastnum.msk|x
+Kill(56) = bastctr.msk|x
+Kill(57) = batbcau.msk|x
+Kill(58) = bastfrr.msk|x
+Kill(59) = batbrfc.msk|x
+Kill(60) = bastgca.rep|x
+Kill(61) = bastums.rep|x
+Kill(62) = batbtri.msk|x
+Kill(63) = ve7.exe|x
+Kill(64) = basteld.msk|x
+Kill(65) = ve7701a.ini|x
+Kill(66) = batbspt.msk|x
+Kill(67) = bastabe.msk|x
+Kill(68) = bastcau.rep|x
+Kill(69) = bastcra.msk|x
+Kill(70) = batbubi.msk|x
+Kill(71) = bastfrm.msk|x
+Kill(72) = basttri.rep|x
+Kill(73) = bastbnp.msk|x
+Kill(74) = bastfca.rep|x
+Kill(75) = batbpro.msk|x
+Kill(76) = bastubi.rep|x
+Kill(77) = batbfid.msk|x
+Kill(78) = baststd.msk|x
+Kill(79) = bastfrd.rep|x
+Kill(80) = bastubi.msk|x
+Kill(81) = bastimb.rep|x
+Kill(82) = bastprs.rep|x
+Kill(83) = bastfca.msk|x
+Kill(84) = ve7700a.msk|x
+Kill(85) = batbbnp.msk|x
+Kill(86) = basttip.rep|x
+Kill(87) = ve7200a.frm|x
+Kill(88) = batbctr.msk|x
+Kill(89) = bastrfa.msk|x
+Kill(90) = ve7200a.msk|x
+Kill(91) = batbcra.msk|x
+Kill(92) = bastums.msk|x
+Kill(93) = ve7300a.frm|x
+Kill(94) = batbprs.msk|x
+Kill(95) = bastgmc.rep|x
+Kill(96) = efstbnp.msk|x
+Kill(97) = ve7500a.msk|x
+Kill(98) = bastspp.rep|x
+Kill(99) = batbcld.msk|x
+Kill(100) = bastfrr.rep|x
+Kill(101) = batbspp.msk|x
+Kill(102) = batbeld.msk|x
+Kill(103) = batbstd.msk|x
+Kill(104) = basttip.msk|x
+Kill(105) = batbgca.msk|x
+
+[ve]
+Data = 09-05-2025
+Descrizione = Vendite
+Dischi = 1
+Moduli = ba,cg9,pr9,mg9,sv9,in9,ef9
+OEM = 
+Patch = 1394
+PostProcess = bainst -0 VE
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/ve1394a1.zip b/cd/test/ve1394a1.zip
new file mode 100644
index 000000000..dedd8ff64
Binary files /dev/null and b/cd/test/ve1394a1.zip differ