diff --git a/components/tdi/Demo/TDIDemo.lpi b/components/tdi/Demo/TDIDemo.lpi
index 1fa373240..94869ad2c 100644
--- a/components/tdi/Demo/TDIDemo.lpi
+++ b/components/tdi/Demo/TDIDemo.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="10"/>
     <PathDelim Value="\"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
@@ -17,9 +17,6 @@
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>
     </BuildModes>
@@ -45,7 +42,6 @@
       <Unit0>
         <Filename Value="TDIDemo.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="TDIDemo"/>
       </Unit0>
       <Unit1>
         <Filename Value="mainform.pas"/>
@@ -92,9 +88,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="4">
diff --git a/components/tdi/Demo/TDIDemo.lps b/components/tdi/Demo/TDIDemo.lps
index 3c4aba43f..2557ec2ea 100644
--- a/components/tdi/Demo/TDIDemo.lps
+++ b/components/tdi/Demo/TDIDemo.lps
@@ -2,14 +2,12 @@
 <CONFIG>
   <ProjectSession>
     <PathDelim Value="\"/>
-    <Version Value="9"/>
+    <Version Value="10"/>
     <BuildModes Active="Default"/>
-    <Units Count="84">
+    <Units Count="76">
       <Unit0>
         <Filename Value="TDIDemo.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="TDIDemo"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="3"/>
         <CursorPos X="43" Y="17"/>
         <UsageCount Value="209"/>
@@ -20,8 +18,6 @@
         <ComponentName Value="Main"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="MainForm"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
         <CursorPos X="10" Y="8"/>
         <UsageCount Value="209"/>
       </Unit1>
@@ -33,9 +29,8 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="uForm1"/>
         <EditorIndex Value="1"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="92"/>
-        <CursorPos X="1" Y="104"/>
+        <CursorPos Y="104"/>
         <UsageCount Value="209"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -48,10 +43,9 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="uForm2"/>
         <EditorIndex Value="2"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="26"/>
         <CursorPos X="19" Y="86"/>
-        <UsageCount Value="151"/>
+        <UsageCount Value="174"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit3>
@@ -61,10 +55,8 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="uMainForm"/>
-        <EditorIndex Value="0"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="191"/>
+        <TopLine Value="17"/>
+        <CursorPos X="72" Y="37"/>
         <UsageCount Value="101"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -72,285 +64,249 @@
       <Unit5>
         <Filename Value="..\tdiclass.pas"/>
         <UnitName Value="TDIClass"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="3"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="345"/>
-        <CursorPos X="25" Y="350"/>
+        <TopLine Value="1040"/>
+        <CursorPos X="77" Y="1057"/>
         <UsageCount Value="101"/>
         <Bookmarks Count="7">
-          <Item0 X="1" Y="348" ID="2"/>
+          <Item0 Y="348" ID="2"/>
           <Item1 X="32" Y="697" ID="4"/>
           <Item2 X="3" Y="282" ID="6"/>
           <Item3 X="3" Y="362" ID="5"/>
           <Item4 X="17" Y="311" ID="7"/>
-          <Item5 X="5" Y="1064" ID="1"/>
-          <Item6 X="40" Y="889" ID="3"/>
+          <Item5 X="5" Y="1067" ID="1"/>
+          <Item6 X="40" Y="892" ID="3"/>
         </Bookmarks>
         <Loaded Value="True"/>
       </Unit5>
       <Unit6>
         <Filename Value="C:\lazarus\lcl\include\customnotebook.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="961"/>
-        <CursorPos X="1" Y="971"/>
-        <UsageCount Value="30"/>
+        <EditorIndex Value="5"/>
+        <TopLine Value="824"/>
+        <CursorPos X="3" Y="829"/>
+        <UsageCount Value="40"/>
+        <Loaded Value="True"/>
       </Unit6>
       <Unit7>
         <Filename Value="C:\lazarus\lcl\include\control.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="4821"/>
-        <CursorPos X="1" Y="4826"/>
-        <UsageCount Value="25"/>
+        <CursorPos Y="4826"/>
+        <UsageCount Value="23"/>
       </Unit7>
       <Unit8>
         <Filename Value="..\tdireg.pas"/>
         <UnitName Value="TDIReg"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
         <CursorPos X="19" Y="20"/>
-        <UsageCount Value="34"/>
+        <UsageCount Value="32"/>
       </Unit8>
       <Unit9>
         <Filename Value="..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
         <ComponentName Value="FormDJ_Main"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="DJ_FormPrincipal"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="130"/>
         <CursorPos X="37" Y="146"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="22"/>
       </Unit9>
       <Unit10>
         <Filename Value="..\..\..\TOOLS\DJ_FormPrincipal.lfm"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="2191"/>
-        <CursorPos X="1" Y="2212"/>
-        <UsageCount Value="6"/>
+        <CursorPos Y="2212"/>
+        <UsageCount Value="4"/>
         <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit10>
       <Unit11>
         <Filename Value="umainform.lfm"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="977"/>
         <CursorPos X="32" Y="976"/>
         <ExtraEditorCount Value="1"/>
         <ExtraEditor1>
-          <WindowIndex Value="0"/>
           <TopLine Value="41"/>
           <CursorPos X="25" Y="60"/>
         </ExtraEditor1>
-        <UsageCount Value="7"/>
+        <UsageCount Value="5"/>
         <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit11>
       <Unit12>
         <Filename Value="..\tdiconst.pas"/>
         <UnitName Value="TDIConst"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="28"/>
         <CursorPos X="20" Y="36"/>
-        <UsageCount Value="63"/>
+        <UsageCount Value="61"/>
       </Unit12>
       <Unit13>
         <Filename Value="C:\lazarus\lcl\controls.pp"/>
         <UnitName Value="Controls"/>
-        <EditorIndex Value="5"/>
-        <WindowIndex Value="0"/>
+        <EditorIndex Value="7"/>
         <TopLine Value="1598"/>
         <CursorPos X="14" Y="1610"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="21"/>
         <Loaded Value="True"/>
       </Unit13>
       <Unit14>
         <Filename Value="C:\lazarus\components\lazcontrols\extendednotebook.pas"/>
         <UnitName Value="ExtendedNotebook"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="211"/>
-        <CursorPos X="1" Y="221"/>
-        <UsageCount Value="19"/>
+        <CursorPos Y="221"/>
+        <UsageCount Value="17"/>
       </Unit14>
       <Unit15>
         <Filename Value="C:\lazarus\lcl\comctrls.pp"/>
         <UnitName Value="ComCtrls"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="378"/>
-        <CursorPos X="14" Y="389"/>
-        <UsageCount Value="30"/>
+        <EditorIndex Value="4"/>
+        <TopLine Value="481"/>
+        <CursorPos X="14" Y="497"/>
+        <UsageCount Value="40"/>
+        <Loaded Value="True"/>
       </Unit15>
       <Unit16>
         <Filename Value="C:\lazarus\lcl\include\pagecontrol.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="161"/>
         <CursorPos X="3" Y="176"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="3"/>
       </Unit16>
       <Unit17>
         <Filename Value="C:\lazarus\lcl\include\bitbtn.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="67"/>
         <CursorPos X="40" Y="79"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit17>
       <Unit18>
         <Filename Value="C:\lazarus\lcl\menus.pp"/>
         <UnitName Value="Menus"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="403"/>
         <CursorPos X="30" Y="410"/>
-        <UsageCount Value="2"/>
+        <UsageCount Value="10"/>
       </Unit18>
       <Unit19>
         <Filename Value="C:\lazarus\lcl\include\menuitem.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="1360"/>
-        <CursorPos X="1" Y="1370"/>
-        <UsageCount Value="4"/>
+        <CursorPos Y="1370"/>
+        <UsageCount Value="2"/>
       </Unit19>
       <Unit20>
         <Filename Value="C:\lazarus\lcl\include\buttons.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="234"/>
         <CursorPos X="42" Y="254"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit20>
       <Unit21>
         <Filename Value="C:\lazarus\lcl\actnlist.pas"/>
         <UnitName Value="ActnList"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="365"/>
-        <CursorPos X="1" Y="378"/>
-        <UsageCount Value="6"/>
+        <CursorPos Y="378"/>
+        <UsageCount Value="4"/>
       </Unit21>
       <Unit22>
         <Filename Value="C:\lazarus\lcl\extctrls.pp"/>
         <UnitName Value="ExtCtrls"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="1144"/>
         <CursorPos X="19" Y="1161"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit22>
       <Unit23>
         <Filename Value="C:\lazarus\lcl\include\buttonglyph.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="209"/>
         <CursorPos X="61" Y="219"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit23>
       <Unit24>
         <Filename Value="C:\lazarus\lcl\alllclunits.pp"/>
-        <UnitName Value="alllclunits"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="19"/>
-        <CursorPos X="1" Y="34"/>
-        <UsageCount Value="6"/>
+        <CursorPos Y="34"/>
+        <UsageCount Value="4"/>
       </Unit24>
       <Unit25>
         <Filename Value="C:\lazarus\lcl\arrow.pp"/>
         <UnitName Value="Arrow"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="69"/>
-        <CursorPos X="1" Y="87"/>
-        <UsageCount Value="6"/>
+        <CursorPos Y="87"/>
+        <UsageCount Value="4"/>
       </Unit25>
       <Unit26>
         <Filename Value="C:\lazarus\lcl\customdrawndrawers.pas"/>
-        <UnitName Value="customdrawndrawers"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="402"/>
         <CursorPos X="3" Y="404"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit26>
       <Unit27>
         <Filename Value="C:\lazarus\lcl\interfaces\wince\wincewsfactory.pas"/>
         <UnitName Value="WinCEWSFactory"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="503"/>
         <CursorPos X="23" Y="514"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit27>
       <Unit28>
         <Filename Value="C:\lazarus\lcl\widgetset\wsmenus.pp"/>
         <UnitName Value="WSMenus"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="196"/>
         <CursorPos X="3" Y="200"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit28>
       <Unit29>
         <Filename Value="C:\lazarus\lcl\widgetset\wsfactory.pas"/>
         <UnitName Value="WSFactory"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="89"/>
         <CursorPos X="10" Y="100"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit29>
       <Unit30>
         <Filename Value="C:\lazarus\lcl\include\menu.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="72"/>
         <CursorPos X="8" Y="82"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit30>
       <Unit31>
         <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\objpas\classes\classesh.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="1665"/>
         <CursorPos X="15" Y="1675"/>
-        <UsageCount Value="4"/>
+        <UsageCount Value="2"/>
       </Unit31>
       <Unit32>
         <Filename Value="C:\lazarus\lcl\registerlcl.pas"/>
         <UnitName Value="RegisterLCL"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="50"/>
-        <CursorPos X="1" Y="1"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit32>
       <Unit33>
         <Filename Value="C:\lazarus\lcl\imglist.pp"/>
         <UnitName Value="ImgList"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="47"/>
         <CursorPos X="12" Y="58"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit33>
       <Unit34>
         <Filename Value="C:\lazarus\lcl\include\custompage.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="117"/>
         <CursorPos X="22" Y="126"/>
-        <UsageCount Value="2"/>
+        <UsageCount Value="10"/>
       </Unit34>
       <Unit35>
         <Filename Value="C:\lazarus\lcl\lclclasses.pp"/>
         <UnitName Value="LCLClasses"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="125"/>
-        <CursorPos X="1" Y="131"/>
-        <UsageCount Value="9"/>
+        <CursorPos Y="131"/>
+        <UsageCount Value="7"/>
       </Unit35>
       <Unit36>
         <Filename Value="C:\lazarus\lcl\buttonpanel.pas"/>
         <UnitName Value="ButtonPanel"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="80"/>
         <CursorPos X="73" Y="97"/>
-        <UsageCount Value="3"/>
+        <UsageCount Value="1"/>
       </Unit36>
       <Unit37>
         <Filename Value="..\..\..\ACBr\trunk\Fontes\ACBrSerial\ACBrECF.pas"/>
-        <UnitName Value="ACBrECF"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="5128"/>
-        <CursorPos X="1" Y="5148"/>
-        <UsageCount Value="7"/>
+        <CursorPos Y="5148"/>
+        <UsageCount Value="5"/>
       </Unit37>
       <Unit38>
         <Filename Value="C:\lazarus\lcl\include\wincontrol.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="5311"/>
-        <CursorPos X="1" Y="5318"/>
-        <UsageCount Value="10"/>
+        <CursorPos Y="5318"/>
+        <UsageCount Value="8"/>
       </Unit38>
       <Unit39>
         <Filename Value="..\..\..\djpdv\djmonitor\DAV.pas"/>
@@ -358,483 +314,363 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Dav"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="997"/>
         <CursorPos X="3" Y="999"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="5"/>
       </Unit39>
       <Unit40>
         <Filename Value="C:\lazarus\lcl\include\customform.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="651"/>
         <CursorPos X="3" Y="660"/>
-        <UsageCount Value="27"/>
+        <UsageCount Value="25"/>
       </Unit40>
       <Unit41>
         <Filename Value="C:\lazarus\lcl\forms.pp"/>
         <UnitName Value="Forms"/>
-        <EditorIndex Value="4"/>
-        <WindowIndex Value="0"/>
+        <EditorIndex Value="6"/>
         <TopLine Value="623"/>
         <CursorPos X="14" Y="634"/>
-        <UsageCount Value="32"/>
+        <UsageCount Value="42"/>
         <Loaded Value="True"/>
       </Unit41>
       <Unit42>
         <Filename Value="C:\lazarus\lcl\lclmessageglue.pas"/>
         <UnitName Value="LCLMessageGlue"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="117"/>
-        <CursorPos X="1" Y="123"/>
-        <UsageCount Value="9"/>
+        <CursorPos Y="123"/>
+        <UsageCount Value="7"/>
       </Unit42>
       <Unit43>
         <Filename Value="C:\lazarus\lcl\interfaces\win32\win32wsforms.pp"/>
         <UnitName Value="Win32WSForms"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="309"/>
-        <CursorPos X="1" Y="316"/>
-        <UsageCount Value="9"/>
+        <CursorPos Y="316"/>
+        <UsageCount Value="7"/>
       </Unit43>
       <Unit44>
         <Filename Value="C:\lazarus\lcl\widgetset\wslclclasses.pp"/>
         <UnitName Value="WSLCLClasses"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="421"/>
         <CursorPos X="3" Y="414"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="5"/>
       </Unit44>
       <Unit45>
         <Filename Value="C:\lazarus\lcl\lclproc.pas"/>
         <UnitName Value="LCLProc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="35"/>
         <CursorPos X="3" Y="45"/>
-        <UsageCount Value="2"/>
+        <UsageCount Value="10"/>
       </Unit45>
       <Unit46>
         <Filename Value="C:\lazarus\lcl\interfaces\win32\win32callback.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="2619"/>
-        <CursorPos X="1" Y="2629"/>
-        <UsageCount Value="9"/>
+        <CursorPos Y="2629"/>
+        <UsageCount Value="7"/>
       </Unit46>
       <Unit47>
         <Filename Value="..\..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
         <ComponentName Value="FormDJ_Main"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="DJ_FormPrincipal"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="431"/>
-        <CursorPos X="1" Y="450"/>
-        <UsageCount Value="15"/>
+        <CursorPos Y="450"/>
+        <UsageCount Value="13"/>
       </Unit47>
       <Unit48>
         <Filename Value="C:\lazarus\lcl\include\customcontrol.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="49"/>
-        <CursorPos X="1" Y="55"/>
-        <UsageCount Value="9"/>
+        <CursorPos Y="55"/>
+        <UsageCount Value="7"/>
       </Unit48>
       <Unit49>
-        <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\objpas\classes\compon.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="465"/>
-        <CursorPos X="3" Y="469"/>
-        <UsageCount Value="1"/>
-      </Unit49>
-      <Unit50>
         <Filename Value="C:\lazarus\lcl\include\application.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="1755"/>
         <CursorPos X="24" Y="1764"/>
+        <UsageCount Value="8"/>
+      </Unit49>
+      <Unit50>
+        <Filename Value="..\..\..\..\..\dev\lazarus\lcl\comctrls.pp"/>
+        <UnitName Value="ComCtrls"/>
+        <TopLine Value="546"/>
+        <CursorPos X="28" Y="561"/>
         <UsageCount Value="10"/>
       </Unit50>
       <Unit51>
-        <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\win\wininc\struct.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="217"/>
-        <CursorPos X="23" Y="228"/>
-        <UsageCount Value="1"/>
+        <Filename Value="C:\lazarus\lcl\include\customupdown.inc"/>
+        <UsageCount Value="10"/>
       </Unit51>
       <Unit52>
-        <Filename Value="..\..\..\..\..\dev\lazarus\lcl\comctrls.pp"/>
-        <UnitName Value="ComCtrls"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="546"/>
-        <CursorPos X="28" Y="561"/>
-        <UsageCount Value="2"/>
+        <Filename Value="C:\lazarus\lcl\lcltype.pp"/>
+        <UnitName Value="LCLType"/>
+        <TopLine Value="395"/>
+        <CursorPos X="3" Y="406"/>
+        <UsageCount Value="10"/>
       </Unit52>
       <Unit53>
-        <Filename Value="..\..\..\..\..\dev\lazarus\components\lazcontrols\extendednotebook.pas"/>
-        <UnitName Value="ExtendedNotebook"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="50"/>
-        <CursorPos X="15" Y="79"/>
-        <UsageCount Value="1"/>
+        <Filename Value="C:\lazarus\lcl\lmessages.pp"/>
+        <UnitName Value="LMessages"/>
+        <TopLine Value="59"/>
+        <CursorPos X="3" Y="79"/>
+        <UsageCount Value="2"/>
       </Unit53>
       <Unit54>
-        <Filename Value="..\..\..\..\..\dev\lazarus\lcl\controls.pp"/>
-        <UnitName Value="Controls"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1891"/>
-        <CursorPos X="1" Y="2014"/>
-        <UsageCount Value="1"/>
+        <Filename Value="C:\lazarus\components\mouseandkeyinput\mouseandkeyinput.pas"/>
+        <UnitName Value="MouseAndKeyInput"/>
+        <TopLine Value="19"/>
+        <UsageCount Value="10"/>
       </Unit54>
       <Unit55>
-        <Filename Value="..\..\..\..\..\dev\lazarus\lcl\include\control.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="4176"/>
-        <CursorPos X="30" Y="4185"/>
-        <UsageCount Value="1"/>
+        <Filename Value="C:\lazarus\components\mouseandkeyinput\winmouseinput.pas"/>
+        <UnitName Value="WinMouseInput"/>
+        <TopLine Value="31"/>
+        <UsageCount Value="10"/>
       </Unit55>
       <Unit56>
-        <Filename Value="..\..\..\..\..\dev\lazarus\lcl\menus.pp"/>
-        <UnitName Value="Menus"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="267"/>
-        <CursorPos X="1" Y="287"/>
-        <UsageCount Value="1"/>
+        <Filename Value="C:\lazarus\components\mouseandkeyinput\winkeyinput.pas"/>
+        <UnitName Value="WinKeyInput"/>
+        <TopLine Value="36"/>
+        <CursorPos X="15" Y="64"/>
+        <UsageCount Value="10"/>
       </Unit56>
       <Unit57>
-        <Filename Value="..\..\..\..\..\dev\lazarus\lcl\include\menuitem.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1426"/>
-        <CursorPos X="3" Y="1435"/>
-        <UsageCount Value="1"/>
+        <Filename Value="C:\lazarus\fpc\2.6.0\source\packages\winunits-jedi\src\jwawinuser.pas"/>
+        <UnitName Value="JwaWinUser"/>
+        <TopLine Value="5016"/>
+        <CursorPos X="10" Y="5027"/>
+        <UsageCount Value="10"/>
       </Unit57>
       <Unit58>
-        <Filename Value="..\..\..\..\..\dev\lazarus\lcl\forms.pp"/>
-        <UnitName Value="Forms"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="399"/>
-        <CursorPos X="14" Y="665"/>
-        <UsageCount Value="1"/>
+        <Filename Value="C:\lazarus\lcl\include\customcheckbox.inc"/>
+        <TopLine Value="125"/>
+        <CursorPos X="17" Y="130"/>
+        <UsageCount Value="10"/>
       </Unit58>
       <Unit59>
-        <Filename Value="..\..\..\..\..\dev\lazarus\lcl\include\wincontrol.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="5527"/>
-        <CursorPos X="3" Y="5532"/>
+        <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\win\wininc\messages.inc"/>
+        <TopLine Value="1324"/>
+        <CursorPos X="6" Y="1324"/>
         <UsageCount Value="1"/>
       </Unit59>
       <Unit60>
-        <Filename Value="C:\lazarus\lcl\include\customupdown.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
-        <UsageCount Value="2"/>
+        <Filename Value="C:\lazarus\lcl\grids.pas"/>
+        <UnitName Value="Grids"/>
+        <TopLine Value="198"/>
+        <CursorPos Y="215"/>
+        <UsageCount Value="1"/>
       </Unit60>
       <Unit61>
-        <Filename Value="C:\lazarus\lcl\lcltype.pp"/>
-        <UnitName Value="LCLType"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="395"/>
-        <CursorPos X="3" Y="406"/>
-        <UsageCount Value="2"/>
+        <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\inc\objpash.inc"/>
+        <TopLine Value="215"/>
+        <CursorPos X="21" Y="225"/>
+        <UsageCount Value="10"/>
       </Unit61>
       <Unit62>
-        <Filename Value="C:\lazarus\lcl\lmessages.pp"/>
-        <UnitName Value="LMessages"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="59"/>
-        <CursorPos X="3" Y="79"/>
-        <UsageCount Value="4"/>
+        <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\inc\objpas.inc"/>
+        <TopLine Value="579"/>
+        <CursorPos X="12" Y="585"/>
+        <UsageCount Value="10"/>
       </Unit62>
       <Unit63>
-        <Filename Value="C:\lazarus\components\mouseandkeyinput\mouseandkeyinput.pas"/>
-        <UnitName Value="MouseAndKeyInput"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="19"/>
-        <CursorPos X="1" Y="1"/>
-        <UsageCount Value="2"/>
+        <Filename Value="C:\lazarus\components\lazutils\lazmethodlist.pas"/>
+        <UnitName Value="LazMethodList"/>
+        <TopLine Value="16"/>
+        <CursorPos X="27" Y="16"/>
+        <UsageCount Value="10"/>
       </Unit63>
       <Unit64>
-        <Filename Value="C:\lazarus\components\mouseandkeyinput\winmouseinput.pas"/>
-        <UnitName Value="WinMouseInput"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="31"/>
-        <CursorPos X="1" Y="1"/>
+        <Filename Value="..\..\powerpdf\PowerPdf.pas"/>
         <UsageCount Value="2"/>
       </Unit64>
       <Unit65>
-        <Filename Value="C:\lazarus\components\mouseandkeyinput\winkeyinput.pas"/>
-        <UnitName Value="WinKeyInput"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="36"/>
-        <CursorPos X="15" Y="64"/>
+        <Filename Value="..\..\rx\curredit.pas"/>
+        <TopLine Value="15"/>
         <UsageCount Value="2"/>
       </Unit65>
       <Unit66>
-        <Filename Value="C:\lazarus\fpc\2.6.0\source\packages\winunits-jedi\src\jwawinuser.pas"/>
-        <UnitName Value="JwaWinUser"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="5016"/>
-        <CursorPos X="10" Y="5027"/>
+        <Filename Value="..\..\..\..\ACBr\trunk\Fontes\ACBrSerial\ACBrECFEpson.pas"/>
+        <TopLine Value="16"/>
+        <CursorPos X="10" Y="30"/>
         <UsageCount Value="2"/>
       </Unit66>
       <Unit67>
-        <Filename Value="C:\lazarus\lcl\include\customcheckbox.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="125"/>
-        <CursorPos X="17" Y="130"/>
+        <Filename Value="..\lgpl-2.1.txt"/>
         <UsageCount Value="2"/>
+        <DefaultSyntaxHighlighter Value="None"/>
       </Unit67>
       <Unit68>
-        <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\win\wininc\messages.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1324"/>
-        <CursorPos X="6" Y="1324"/>
-        <UsageCount Value="3"/>
-      </Unit68>
-      <Unit69>
-        <Filename Value="C:\lazarus\lcl\grids.pas"/>
-        <UnitName Value="Grids"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="198"/>
-        <CursorPos X="1" Y="215"/>
-        <UsageCount Value="3"/>
-      </Unit69>
-      <Unit70>
-        <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\inc\objpash.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="215"/>
-        <CursorPos X="21" Y="225"/>
-        <UsageCount Value="2"/>
-      </Unit70>
-      <Unit71>
-        <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\inc\objpas.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="579"/>
-        <CursorPos X="12" Y="585"/>
-        <UsageCount Value="2"/>
-      </Unit71>
-      <Unit72>
-        <Filename Value="C:\lazarus\components\lazutils\lazmethodlist.pas"/>
-        <UnitName Value="LazMethodList"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="16"/>
-        <CursorPos X="27" Y="16"/>
-        <UsageCount Value="2"/>
-      </Unit72>
-      <Unit73>
-        <Filename Value="..\..\powerpdf\PowerPdf.pas"/>
-        <UnitName Value="PowerPdf"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
-        <UsageCount Value="4"/>
-      </Unit73>
-      <Unit74>
-        <Filename Value="..\..\rx\curredit.pas"/>
-        <UnitName Value="curredit"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="15"/>
-        <CursorPos X="1" Y="1"/>
-        <UsageCount Value="4"/>
-      </Unit74>
-      <Unit75>
-        <Filename Value="..\..\..\..\ACBr\trunk\Fontes\ACBrSerial\ACBrECFEpson.pas"/>
-        <UnitName Value="ACBrECFEpson"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="16"/>
-        <CursorPos X="10" Y="30"/>
-        <UsageCount Value="4"/>
-      </Unit75>
-      <Unit76>
-        <Filename Value="..\lgpl-2.1.txt"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
-        <UsageCount Value="4"/>
-        <DefaultSyntaxHighlighter Value="None"/>
-      </Unit76>
-      <Unit77>
         <Filename Value="..\read-me.txt"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="6"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="150"/>
-        <CursorPos X="10" Y="170"/>
-        <UsageCount Value="32"/>
+        <EditorIndex Value="8"/>
+        <TopLine Value="40"/>
+        <CursorPos X="50" Y="58"/>
+        <UsageCount Value="42"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="None"/>
-      </Unit77>
-      <Unit78>
+      </Unit68>
+      <Unit69>
         <Filename Value="..\tdi.pas"/>
         <UnitName Value="TDI"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
-        <UsageCount Value="4"/>
-      </Unit78>
-      <Unit79>
+        <UsageCount Value="2"/>
+      </Unit69>
+      <Unit70>
         <Filename Value="C:\lazarus\lcl\lresources.pp"/>
         <UnitName Value="LResources"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="1655"/>
-        <CursorPos X="1" Y="1667"/>
-        <UsageCount Value="7"/>
-      </Unit79>
-      <Unit80>
+        <CursorPos Y="1667"/>
+        <UsageCount Value="5"/>
+      </Unit70>
+      <Unit71>
         <Filename Value="..\..\..\..\..\TOOLS\DJ_Registro.pas"/>
         <ComponentName Value="DJRegForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="DJ_Registro"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
         <CursorPos X="101" Y="7"/>
-        <UsageCount Value="7"/>
-      </Unit80>
-      <Unit81>
+        <UsageCount Value="5"/>
+      </Unit71>
+      <Unit72>
         <Filename Value="C:\lazarus\lcl\include\scrollingwincontrol.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="246"/>
-        <CursorPos X="1" Y="256"/>
-        <UsageCount Value="9"/>
-      </Unit81>
-      <Unit82>
+        <CursorPos Y="256"/>
+        <UsageCount Value="7"/>
+      </Unit72>
+      <Unit73>
         <Filename Value="C:\lazarus\lcl\interfaces\win32\win32object.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="450"/>
-        <CursorPos X="1" Y="457"/>
-        <UsageCount Value="9"/>
-      </Unit82>
-      <Unit83>
+        <CursorPos Y="457"/>
+        <UsageCount Value="7"/>
+      </Unit73>
+      <Unit74>
         <Filename Value="..\..\..\..\..\..\Comp\ACBr\trunk\Fontes\ACBrTCP\ACBrTCP-change-log.txt"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="28"/>
-        <CursorPos X="1" Y="40"/>
-        <UsageCount Value="9"/>
+        <CursorPos Y="40"/>
+        <UsageCount Value="7"/>
         <DefaultSyntaxHighlighter Value="None"/>
-      </Unit83>
+      </Unit74>
+      <Unit75>
+        <Filename Value="..\..\..\..\..\..\Comp\ACBr\trunk2\Fontes\ACBrComum\ACBrUtil.pas"/>
+        <EditorIndex Value="9"/>
+        <TopLine Value="3067"/>
+        <CursorPos X="37" Y="3094"/>
+        <UsageCount Value="20"/>
+        <Loaded Value="True"/>
+      </Unit75>
     </Units>
-    <General>
-      <ActiveWindowIndexAtStart Value="0"/>
-    </General>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="29" HistoryIndex="28">
       <Position1>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="366" Column="1" TopLine="347"/>
+        <Caret Line="1079" TopLine="1070"/>
       </Position1>
       <Position2>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="368" Column="1" TopLine="349"/>
+        <Caret Line="1081" TopLine="1070"/>
       </Position2>
       <Position3>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="373" Column="1" TopLine="362"/>
+        <Caret Line="1083" Column="109" TopLine="1070"/>
       </Position3>
       <Position4>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="351" Column="1" TopLine="339"/>
+        <Caret Line="1081" Column="101" TopLine="1070"/>
       </Position4>
       <Position5>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="352" Column="1" TopLine="339"/>
+        <Caret Line="166" Column="15" TopLine="155"/>
       </Position5>
       <Position6>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="357" Column="1" TopLine="345"/>
+        <Caret Line="1284" Column="3" TopLine="1272"/>
       </Position6>
       <Position7>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="359" Column="1" TopLine="345"/>
+        <Caret Line="172" Column="15" TopLine="156"/>
       </Position7>
       <Position8>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="361" Column="1" TopLine="345"/>
+        <Caret Line="1129" Column="12" TopLine="1119"/>
       </Position8>
       <Position9>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="363" Column="1" TopLine="345"/>
+        <Caret Line="172" Column="15" TopLine="156"/>
       </Position9>
       <Position10>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="366" Column="1" TopLine="347"/>
+        <Caret Line="1153" Column="49" TopLine="1133"/>
       </Position10>
       <Position11>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="351" Column="31" TopLine="345"/>
+        <Caret Line="1154" Column="7" TopLine="1134"/>
       </Position11>
       <Position12>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="357" Column="18" TopLine="345"/>
+        <Caret Line="1155" TopLine="1134"/>
       </Position12>
       <Position13>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="351" Column="1" TopLine="345"/>
+        <Caret Line="1163" TopLine="1136"/>
       </Position13>
       <Position14>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="352" Column="1" TopLine="345"/>
+        <Caret Line="1155" TopLine="1136"/>
       </Position14>
       <Position15>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="357" Column="1" TopLine="345"/>
+        <Caret Line="1160" TopLine="1136"/>
       </Position15>
       <Position16>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="359" Column="1" TopLine="345"/>
+        <Caret Line="1161" TopLine="1136"/>
       </Position16>
       <Position17>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="361" Column="1" TopLine="345"/>
+        <Caret Line="1150" Column="28" TopLine="1136"/>
       </Position17>
       <Position18>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="363" Column="1" TopLine="345"/>
+        <Caret Line="1159" TopLine="1137"/>
       </Position18>
       <Position19>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="351" Column="1" TopLine="345"/>
+        <Filename Value="..\..\..\..\..\..\Comp\ACBr\trunk2\Fontes\ACBrComum\ACBrUtil.pas"/>
+        <Caret Line="19" Column="102"/>
       </Position19>
       <Position20>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="352" Column="1" TopLine="345"/>
+        <Filename Value="..\read-me.txt"/>
+        <Caret Column="40"/>
       </Position20>
       <Position21>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="357" Column="1" TopLine="345"/>
+        <Filename Value="..\read-me.txt"/>
+        <Caret Line="30" Column="78"/>
       </Position21>
       <Position22>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="359" Column="1" TopLine="345"/>
+        <Filename Value="..\read-me.txt"/>
+        <Caret Line="35" Column="38" TopLine="5"/>
       </Position22>
       <Position23>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="361" Column="1" TopLine="345"/>
+        <Filename Value="..\read-me.txt"/>
+        <Caret Column="5"/>
       </Position23>
       <Position24>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="351" Column="1" TopLine="345"/>
+        <Filename Value="..\read-me.txt"/>
+        <Caret Line="27" Column="58"/>
       </Position24>
       <Position25>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="352" Column="1" TopLine="345"/>
+        <Filename Value="..\read-me.txt"/>
+        <Caret Line="31" Column="5"/>
       </Position25>
       <Position26>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="353" Column="1" TopLine="345"/>
+        <Filename Value="..\read-me.txt"/>
+        <Caret Line="46" Column="5" TopLine="16"/>
       </Position26>
       <Position27>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="357" Column="1" TopLine="345"/>
+        <Filename Value="..\read-me.txt"/>
+        <Caret Line="64" Column="7" TopLine="34"/>
       </Position27>
       <Position28>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="372" Column="1" TopLine="361"/>
+        <Filename Value="..\read-me.txt"/>
+        <Caret Line="68" Column="42" TopLine="38"/>
       </Position28>
       <Position29>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="351" Column="1" TopLine="345"/>
+        <Filename Value="..\read-me.txt"/>
+        <Caret Line="71" Column="13" TopLine="41"/>
       </Position29>
-      <Position30>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="354" Column="26" TopLine="345"/>
-      </Position30>
     </JumpHistory>
   </ProjectSession>
   <Debugging>
@@ -848,5 +684,4 @@
       </Item1>
     </BreakPoints>
   </Debugging>
-  <EditorMacros Count="0"/>
 </CONFIG>
diff --git a/components/tdi/Demo/TDIDemo.res b/components/tdi/Demo/TDIDemo.res
index 6389f3aef..a6fa3db25 100644
Binary files a/components/tdi/Demo/TDIDemo.res and b/components/tdi/Demo/TDIDemo.res differ
diff --git a/components/tdi/opm/TDINoteBook.json b/components/tdi/opm/TDINoteBook.json
new file mode 100644
index 000000000..ae504e171
--- /dev/null
+++ b/components/tdi/opm/TDINoteBook.json
@@ -0,0 +1,30 @@
+{
+  "PackageData0" : {
+    "Name" : "tdi",
+    "DisplayName" : "TDINoteBook",
+    "Category" : "GUIContainers, Tabbed Components",
+    "RepositoryFileName" : "TDINoteBook.zip",
+    "RepositoryFileSize" : 188471,
+    "RepositoryFileHash" : "ee155ec04531fc163f19b6922969e23f",
+    "RepositoryDate" : 4.3024000000000000E+004,
+    "PackageBaseDir" : "tdi\\/",
+    "HomePageURL" : "http://wiki.freepascal.org/TTDINotebook",
+    "DownloadURL" : "https://lazarus-ccr.svn.sourceforge.net/svnroot/lazarus-ccr/components/tdi/opm/update_tdi.json",
+    "SVNURL" : ""
+  },
+  "PackageFiles0" : [
+    {
+      "Name" : "tdi.lpk",
+      "Description" : " TDINotebook provides a Tabbed Document Interface (TDI). ",
+      "Author" : "Daniel Simões de Almeida",
+      "License" : "LGPL",
+      "RelativeFilePath" : "",
+      "VersionAsString" : "0.2.0.0",
+      "LazCompatibility" : "1.6, 1.8, Trunk",
+      "FPCCompatibility" : "2.6.4, 3.0.4",
+      "SupportedWidgetSet" : "win32/64, gtk2, carbon, qt",
+      "PackageType" : 0,
+      "DependenciesAsString" : "LazControls, LCL, FCL"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/components/tdi/opm/update_TDINoteBook.json b/components/tdi/opm/update_TDINoteBook.json
new file mode 100644
index 000000000..1e6a591bf
--- /dev/null
+++ b/components/tdi/opm/update_TDINoteBook.json
@@ -0,0 +1,15 @@
+{
+  "UpdateLazPackages" : [
+    {
+      "ForceNotify" : false,
+      "InternalVersion" : 1,
+      "Name" : "tdi.lpk",
+      "Version" : "0.2.0.0"
+    }
+  ],
+  "UpdatePackageData" : {
+    "DisableInOPM" : false,
+    "DownloadZipURL" : "https://lazarus-ccr.svn.sourceforge.net/svnroot/lazarus-ccr/components/tdi/opm/update_tdi.json",
+    "Name" : "tdi"
+  }
+}
\ No newline at end of file
diff --git a/components/tdi/read-me.txt b/components/tdi/read-me.txt
index a67e83544..3e19c2010 100644
--- a/components/tdi/read-me.txt
+++ b/components/tdi/read-me.txt
@@ -1,4 +1,4 @@
-http://wiki.freepascal.org/tdi
+http://wiki.freepascal.org/TTDINotebook
 
 === Contents ===
 
@@ -24,8 +24,7 @@ applications need to open several windows at once without ShowModal.
   However, the MDI interface concept has several problems, which may confuse the
 novice user. A more complete study on the advantages and disadvantages of the
 MDI can be found at wikipedia:
-http://en.wikipedia.org/wiki/Multiple_document_interface#
-Comparison_with_single_document_interface
+http://en.wikipedia.org/wiki/Multiple_document_interface#Comparison_with_single_document_interface
 
   The intention of this component is to provide a simple way to create an TDI
 interface, similar to that described in Wikipedia.
@@ -77,7 +76,7 @@ You will need a SVN Client
 
 === 7 - Screenshot ===
 
-http://wiki.freepascal.org/tdi#Screenshot
+http://wiki.freepascal.org/TTDINotebook#Screenshot
 
 === 8 - Installation ===
 
diff --git a/components/tdi/tdi.lpk b/components/tdi/tdi.lpk
index 9a50151de..d06d63298 100644
--- a/components/tdi/tdi.lpk
+++ b/components/tdi/tdi.lpk
@@ -1,21 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <Package Version="4">
     <PathDelim Value="\"/>
     <Name Value="TDI"/>
+    <Type Value="RunAndDesignTime"/>
+    <Author Value="Daniel Simões de Almeida"/>
     <CompilerOptions>
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
-      <Other>
-        <CompilerMessages>
-          <MsgFileName Value=""/>
-        </CompilerMessages>
-        <CompilerPath Value="$(CompPath)"/>
-      </Other>
     </CompilerOptions>
+    <Description Value=" TDINotebook provides a Tabbed Document Interface (TDI). "/>
+    <License Value="LGPL"/>
     <Version Minor="2"/>
     <Files Count="3">
       <Item1>
@@ -32,7 +30,6 @@
         <UnitName Value="TDIReg"/>
       </Item3>
     </Files>
-    <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="3">
       <Item1>
         <PackageName Value="LazControls"/>