diff --git a/components/virtualtreeview-new/branches/4.8/demos/advanced/Advanced.lpi b/components/virtualtreeview-new/branches/4.8/demos/advanced/Advanced.lpi
index 16eaad3b3..bd01b630d 100644
--- a/components/virtualtreeview-new/branches/4.8/demos/advanced/Advanced.lpi
+++ b/components/virtualtreeview-new/branches/4.8/demos/advanced/Advanced.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>
@@ -42,7 +42,6 @@
       <Unit0>
         <Filename Value="Advanced.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="Advanced"/>
       </Unit0>
       <Unit1>
         <Filename Value="WindowsXPStyleDemo.pas"/>
@@ -50,7 +49,6 @@
         <ComponentName Value="WindowsXPForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="WindowsXPStyleDemo"/>
       </Unit1>
       <Unit2>
         <Filename Value="AlignDemo.pas"/>
@@ -58,7 +56,6 @@
         <ComponentName Value="AlignForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="AlignDemo"/>
       </Unit2>
       <Unit3>
         <Filename Value="DrawTreeDemo.pas"/>
@@ -66,12 +63,10 @@
         <ComponentName Value="DrawTreeForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="DrawTreeDemo"/>
       </Unit3>
       <Unit4>
         <Filename Value="Editors.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="Editors"/>
       </Unit4>
       <Unit5>
         <Filename Value="GeneralAbilitiesDemo.pas"/>
@@ -79,7 +74,6 @@
         <ComponentName Value="GeneralForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="GeneralAbilitiesDemo"/>
       </Unit5>
       <Unit6>
         <Filename Value="GridDemo.pas"/>
@@ -87,7 +81,6 @@
         <ComponentName Value="GridForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="GridDemo"/>
       </Unit6>
       <Unit7>
         <Filename Value="HeaderCustomDrawDemo.pas"/>
@@ -95,7 +88,6 @@
         <ComponentName Value="HeaderOwnerDrawForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="HeaderCustomDrawDemo"/>
       </Unit7>
       <Unit8>
         <Filename Value="Main.pas"/>
@@ -103,7 +95,6 @@
         <ComponentName Value="MainForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="Main"/>
       </Unit8>
       <Unit9>
         <Filename Value="MultilineDemo.pas"/>
@@ -111,7 +102,6 @@
         <ComponentName Value="NodeForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="MultilineDemo"/>
       </Unit9>
       <Unit10>
         <Filename Value="PropertiesDemo.pas"/>
@@ -119,7 +109,6 @@
         <ComponentName Value="PropertiesForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="PropertiesDemo"/>
       </Unit10>
       <Unit11>
         <Filename Value="SpeedDemo.pas"/>
@@ -127,7 +116,6 @@
         <ComponentName Value="SpeedForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="SpeedDemo"/>
       </Unit11>
       <Unit12>
         <Filename Value="States.pas"/>
@@ -135,7 +123,6 @@
         <ComponentName Value="StateForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="States"/>
       </Unit12>
       <Unit13>
         <Filename Value="VisibilityDemo.pas"/>
@@ -143,25 +130,26 @@
         <ComponentName Value="VisibilityForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="VisibilityDemo"/>
       </Unit13>
       <Unit14>
         <Filename Value="shlobjext.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="shlobjext"/>
       </Unit14>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="11"/>
     <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="advanced"/>
+    </Target>
+    <SearchPaths>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
     <Parsing>
       <SyntaxOptions>
         <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
 </CONFIG>
diff --git a/components/virtualtreeview-new/branches/4.8/demos/dataarray/dataarray.lpi b/components/virtualtreeview-new/branches/4.8/demos/dataarray/dataarray.lpi
index 2d7455072..2aca38f65 100644
--- a/components/virtualtreeview-new/branches/4.8/demos/dataarray/dataarray.lpi
+++ b/components/virtualtreeview-new/branches/4.8/demos/dataarray/dataarray.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>
@@ -40,7 +40,6 @@
       <Unit0>
         <Filename Value="dataarray.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="dataarray"/>
       </Unit0>
       <Unit1>
         <Filename Value="Main.pas"/>
@@ -48,13 +47,18 @@
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="Main"/>
       </Unit1>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="11"/>
     <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="dataarray"/>
+    </Target>
+    <SearchPaths>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
     <Parsing>
       <SyntaxOptions>
         <UseAnsiStrings Value="False"/>
@@ -67,8 +71,5 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
 </CONFIG>
diff --git a/components/virtualtreeview-new/branches/4.8/demos/images/images.lpi b/components/virtualtreeview-new/branches/4.8/demos/images/images.lpi
index 5819ae99a..4f7fe8530 100644
--- a/components/virtualtreeview-new/branches/4.8/demos/images/images.lpi
+++ b/components/virtualtreeview-new/branches/4.8/demos/images/images.lpi
@@ -1,20 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
+    <Version Value="9"/>
     <PathDelim Value="\"/>
-    <Version Value="7"/>
     <General>
       <Flags>
-        <AlwaysBuild Value="False"/>
         <LRSInOutputDirectory Value="False"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
     </General>
     <VersionInfo>
-      <ProjectVersion Value=""/>
+      <StringTable ProductVersion=""/>
     </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
@@ -38,7 +39,6 @@
       <Unit0>
         <Filename Value="images.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="images"/>
       </Unit0>
       <Unit1>
         <Filename Value="Unit1.pas"/>
@@ -46,13 +46,23 @@
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="Unit1"/>
       </Unit1>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="images"/>
+    </Target>
+    <SearchPaths>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <Linking>
       <Options>
         <Win32>
@@ -60,8 +70,5 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
 </CONFIG>
diff --git a/components/virtualtreeview-new/branches/4.8/demos/mininal/minimal_lcl.lpi b/components/virtualtreeview-new/branches/4.8/demos/mininal/minimal_lcl.lpi
index 289cff8d3..c4aca9e10 100644
--- a/components/virtualtreeview-new/branches/4.8/demos/mininal/minimal_lcl.lpi
+++ b/components/virtualtreeview-new/branches/4.8/demos/mininal/minimal_lcl.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>
@@ -40,7 +40,6 @@
       <Unit0>
         <Filename Value="minimal_lcl.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="minimal_lcl"/>
       </Unit0>
       <Unit1>
         <Filename Value="Main.pas"/>
@@ -48,20 +47,22 @@
         <ComponentName Value="MainForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="Main"/>
       </Unit1>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="11"/>
     <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="minimal"/>
+    </Target>
+    <SearchPaths>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
     <Parsing>
       <SyntaxOptions>
         <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
 </CONFIG>
diff --git a/components/virtualtreeview-new/branches/4.8/demos/objects/mvcdemo.lpi b/components/virtualtreeview-new/branches/4.8/demos/objects/mvcdemo.lpi
index c07d9e670..e2c60ade5 100644
--- a/components/virtualtreeview-new/branches/4.8/demos/objects/mvcdemo.lpi
+++ b/components/virtualtreeview-new/branches/4.8/demos/objects/mvcdemo.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>
@@ -43,7 +43,6 @@
       <Unit0>
         <Filename Value="mvcdemo.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="mvcdemo"/>
       </Unit0>
       <Unit1>
         <Filename Value="MVCDemoMain.pas"/>
@@ -51,30 +50,30 @@
         <ComponentName Value="fmMVCDemo"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="MVCDemoMain"/>
       </Unit1>
       <Unit2>
         <Filename Value="MVCPanel.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="MVCPanel"/>
       </Unit2>
       <Unit3>
         <Filename Value="MVCTypes.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="MVCTypes"/>
       </Unit3>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="11"/>
     <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="mvcdemo"/>
+    </Target>
+    <SearchPaths>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
     <Parsing>
       <SyntaxOptions>
         <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
 </CONFIG>
diff --git a/components/virtualtreeview-new/branches/4.8/demos/ole/ole.lpi b/components/virtualtreeview-new/branches/4.8/demos/ole/ole.lpi
index 75e370677..215de27b2 100644
--- a/components/virtualtreeview-new/branches/4.8/demos/ole/ole.lpi
+++ b/components/virtualtreeview-new/branches/4.8/demos/ole/ole.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>
@@ -40,7 +40,6 @@
       <Unit0>
         <Filename Value="ole.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ole"/>
       </Unit0>
       <Unit1>
         <Filename Value="Main.pas"/>
@@ -48,13 +47,18 @@
         <ComponentName Value="MainForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="Main"/>
       </Unit1>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="11"/>
     <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="ole"/>
+    </Target>
+    <SearchPaths>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
     <Parsing>
       <SyntaxOptions>
         <CStyleOperator Value="False"/>
@@ -66,8 +70,5 @@
         <UseHeaptrc Value="True"/>
       </Debugging>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
 </CONFIG>
diff --git a/components/virtualtreeview-new/branches/4.8/demos/unicode/unicode.lpi b/components/virtualtreeview-new/branches/4.8/demos/unicode/unicode.lpi
index 55735eb6c..a45a05778 100644
--- a/components/virtualtreeview-new/branches/4.8/demos/unicode/unicode.lpi
+++ b/components/virtualtreeview-new/branches/4.8/demos/unicode/unicode.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>
@@ -40,22 +40,26 @@
       <Unit0>
         <Filename Value="unicode.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="unicode"/>
       </Unit0>
       <Unit1>
         <Filename Value="fmain.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="MainForm"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="fMain"/>
       </Unit1>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="unicode"/>
+    </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
@@ -69,11 +73,5 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerMessages>
-        <UseMsgFile Value="True"/>
-      </CompilerMessages>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
 </CONFIG>
diff --git a/components/virtualtreeview-new/branches/4.8/demos/vtbasic/vtbasic.lpi b/components/virtualtreeview-new/branches/4.8/demos/vtbasic/vtbasic.lpi
index 39d39d84e..1b2a4ab9b 100644
--- a/components/virtualtreeview-new/branches/4.8/demos/vtbasic/vtbasic.lpi
+++ b/components/virtualtreeview-new/branches/4.8/demos/vtbasic/vtbasic.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>
@@ -47,7 +47,6 @@
       <Unit0>
         <Filename Value="vtbasic.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="vtbasic"/>
       </Unit0>
       <Unit1>
         <Filename Value="Main.pas"/>
@@ -55,12 +54,10 @@
         <ComponentName Value="frmMain"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="Main"/>
       </Unit1>
       <Unit2>
         <Filename Value="VTEditors.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="VTEditors"/>
       </Unit2>
       <Unit3>
         <Filename Value="VTNoData.pas"/>
@@ -68,7 +65,6 @@
         <ComponentName Value="frmVTNoData"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="VTNoData"/>
       </Unit3>
       <Unit4>
         <Filename Value="VTPropEdit.pas"/>
@@ -76,19 +72,16 @@
         <ComponentName Value="frmVTPropEdit"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="VTPropEdit"/>
       </Unit4>
       <Unit5>
         <Filename Value="VTreeData.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="VTreeData"/>
       </Unit5>
       <Unit6>
         <Filename Value="ViewCode.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmViewCode"/>
         <HasResources Value="True"/>
-        <UnitName Value="ViewCode"/>
       </Unit6>
       <Unit7>
         <Filename Value="VTCheckList.pas"/>
@@ -96,7 +89,6 @@
         <ComponentName Value="frmVTCheckList"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="VTCheckList"/>
       </Unit7>
       <Unit8>
         <Filename Value="VTDBExample.pas"/>
@@ -104,13 +96,18 @@
         <ComponentName Value="frmVTDBExample"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="VTDBExample"/>
       </Unit8>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="11"/>
     <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="vtbasic"/>
+    </Target>
+    <SearchPaths>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
     <Parsing>
       <SyntaxOptions>
         <UseAnsiStrings Value="False"/>
@@ -123,8 +120,5 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
 </CONFIG>