diff --git a/components/tdi/Demo/TDIDemo.lps b/components/tdi/Demo/TDIDemo.lps
index 5e60767f4..b5f488bf7 100644
--- a/components/tdi/Demo/TDIDemo.lps
+++ b/components/tdi/Demo/TDIDemo.lps
@@ -12,7 +12,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="36" Y="18"/>
-        <UsageCount Value="88"/>
+        <UsageCount Value="95"/>
       </Unit0>
       <Unit1>
         <Filename Value="mainform.pas"/>
@@ -23,7 +23,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="10" Y="8"/>
-        <UsageCount Value="88"/>
+        <UsageCount Value="95"/>
       </Unit1>
       <Unit2>
         <Filename Value="uform1.pas"/>
@@ -36,7 +36,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="64"/>
         <CursorPos X="15" Y="70"/>
-        <UsageCount Value="88"/>
+        <UsageCount Value="95"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit2>
@@ -46,12 +46,11 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="uMainForm"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="87"/>
-        <CursorPos X="17" Y="90"/>
-        <UsageCount Value="44"/>
+        <TopLine Value="79"/>
+        <CursorPos X="15" Y="82"/>
+        <UsageCount Value="47"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit3>
@@ -62,7 +61,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="770"/>
         <CursorPos X="49" Y="709"/>
-        <UsageCount Value="44"/>
+        <UsageCount Value="47"/>
         <Bookmarks Count="3">
           <Item0 X="17" Y="729" ID="3"/>
           <Item1 X="3" Y="650" ID="2"/>
@@ -76,30 +75,31 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="1" Y="10"/>
-        <UsageCount Value="4"/>
+        <UsageCount Value="3"/>
       </Unit5>
       <Unit6>
         <Filename Value="C:\lazarus\lcl\include\customnotebook.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="740"/>
         <CursorPos X="1" Y="751"/>
-        <UsageCount Value="18"/>
+        <UsageCount Value="17"/>
       </Unit6>
       <Unit7>
         <Filename Value="C:\lazarus\lcl\include\control.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="2124"/>
         <CursorPos X="1" Y="2135"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
       </Unit7>
       <Unit8>
         <Filename Value="..\tdireg.pas"/>
         <UnitName Value="TDIReg"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="6"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
-        <CursorPos X="23" Y="5"/>
-        <UsageCount Value="28"/>
+        <CursorPos X="1" Y="22"/>
+        <UsageCount Value="31"/>
         <Loaded Value="True"/>
       </Unit8>
       <Unit9>
@@ -111,7 +111,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="130"/>
         <CursorPos X="37" Y="146"/>
-        <UsageCount Value="35"/>
+        <UsageCount Value="34"/>
       </Unit9>
       <Unit10>
         <Filename Value="C:\lazarus\lcl\stdctrls.pp"/>
@@ -119,7 +119,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1126"/>
         <CursorPos X="3" Y="1137"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit10>
       <Unit11>
         <Filename Value="C:\lazarus\lcl\buttons.pp"/>
@@ -127,14 +127,14 @@
         <WindowIndex Value="0"/>
         <TopLine Value="173"/>
         <CursorPos X="14" Y="184"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit11>
       <Unit12>
         <Filename Value="..\..\..\TOOLS\DJ_FormPrincipal.lfm"/>
         <WindowIndex Value="0"/>
         <TopLine Value="2191"/>
         <CursorPos X="1" Y="2212"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
         <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit12>
       <Unit13>
@@ -143,7 +143,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="349"/>
         <CursorPos X="22" Y="12"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
       </Unit13>
       <Unit14>
         <Filename Value="umainform.lfm"/>
@@ -156,7 +156,7 @@
           <TopLine Value="2474"/>
           <CursorPos X="32" Y="2480"/>
         </ExtraEditor1>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
         <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit14>
       <Unit15>
@@ -166,7 +166,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="13" Y="10"/>
-        <UsageCount Value="41"/>
+        <UsageCount Value="44"/>
         <Loaded Value="True"/>
       </Unit15>
       <Unit16>
@@ -175,7 +175,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="2104"/>
         <CursorPos X="21" Y="2123"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit16>
       <Unit17>
         <Filename Value="C:\lazarus\lcl\graphics.pp"/>
@@ -183,7 +183,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1466"/>
         <CursorPos X="3" Y="1477"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
       </Unit17>
       <Unit18>
         <Filename Value="C:\lazarus\components\lazcontrols\extendednotebook.pas"/>
@@ -191,7 +191,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="35"/>
         <CursorPos X="3" Y="57"/>
-        <UsageCount Value="20"/>
+        <UsageCount Value="19"/>
       </Unit18>
       <Unit19>
         <Filename Value="C:\lazarus\lcl\comctrls.pp"/>
@@ -199,14 +199,14 @@
         <WindowIndex Value="0"/>
         <TopLine Value="218"/>
         <CursorPos X="3" Y="218"/>
-        <UsageCount Value="22"/>
+        <UsageCount Value="21"/>
       </Unit19>
       <Unit20>
         <Filename Value="C:\lazarus\lcl\include\pagecontrol.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="22"/>
         <CursorPos X="1" Y="34"/>
-        <UsageCount Value="16"/>
+        <UsageCount Value="15"/>
       </Unit20>
       <Unit21>
         <Filename Value="..\..\..\ACBr\trunk\Fontes\ACBrComum\ACBrAAC.pas"/>
@@ -214,7 +214,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="1" Y="1"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="4"/>
       </Unit21>
       <Unit22>
         <Filename Value="..\..\..\ACBr\trunk\Fontes\ACBrComum\ACBrPAFClass.pas"/>
@@ -222,14 +222,14 @@
         <WindowIndex Value="0"/>
         <TopLine Value="241"/>
         <CursorPos X="17" Y="252"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="4"/>
       </Unit22>
       <Unit23>
         <Filename Value="C:\lazarus\lcl\include\bitbtn.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="67"/>
         <CursorPos X="40" Y="79"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit23>
       <Unit24>
         <Filename Value="C:\lazarus\lcl\menus.pp"/>
@@ -237,21 +237,21 @@
         <WindowIndex Value="0"/>
         <TopLine Value="110"/>
         <CursorPos X="3" Y="118"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
       </Unit24>
       <Unit25>
         <Filename Value="C:\lazarus\lcl\include\menuitem.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1085"/>
         <CursorPos X="1" Y="1103"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit25>
       <Unit26>
         <Filename Value="C:\lazarus\lcl\include\buttons.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="234"/>
         <CursorPos X="42" Y="254"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit26>
       <Unit27>
         <Filename Value="C:\lazarus\lcl\actnlist.pas"/>
@@ -259,7 +259,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="365"/>
         <CursorPos X="1" Y="378"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit27>
       <Unit28>
         <Filename Value="C:\lazarus\lcl\extctrls.pp"/>
@@ -267,14 +267,14 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1144"/>
         <CursorPos X="19" Y="1161"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit28>
       <Unit29>
         <Filename Value="C:\lazarus\lcl\include\buttonglyph.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="209"/>
         <CursorPos X="61" Y="219"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit29>
       <Unit30>
         <Filename Value="C:\lazarus\lcl\alllclunits.pp"/>
@@ -282,7 +282,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="19"/>
         <CursorPos X="1" Y="34"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit30>
       <Unit31>
         <Filename Value="C:\lazarus\lcl\arrow.pp"/>
@@ -290,7 +290,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="69"/>
         <CursorPos X="1" Y="87"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit31>
       <Unit32>
         <Filename Value="C:\lazarus\lcl\customdrawndrawers.pas"/>
@@ -298,7 +298,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="402"/>
         <CursorPos X="3" Y="404"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit32>
       <Unit33>
         <Filename Value="C:\lazarus\lcl\interfaces\wince\wincewsfactory.pas"/>
@@ -306,7 +306,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="503"/>
         <CursorPos X="23" Y="514"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit33>
       <Unit34>
         <Filename Value="C:\lazarus\lcl\widgetset\wsmenus.pp"/>
@@ -314,7 +314,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="196"/>
         <CursorPos X="3" Y="200"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit34>
       <Unit35>
         <Filename Value="C:\lazarus\lcl\widgetset\wsfactory.pas"/>
@@ -322,21 +322,21 @@
         <WindowIndex Value="0"/>
         <TopLine Value="89"/>
         <CursorPos X="10" Y="100"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit35>
       <Unit36>
         <Filename Value="C:\lazarus\lcl\include\menu.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="72"/>
         <CursorPos X="8" Y="82"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit36>
       <Unit37>
         <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\objpas\classes\classesh.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1535"/>
         <CursorPos X="5" Y="1546"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
       </Unit37>
       <Unit38>
         <Filename Value="C:\lazarus\lcl\registerlcl.pas"/>
@@ -344,7 +344,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="50"/>
         <CursorPos X="1" Y="1"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit38>
       <Unit39>
         <Filename Value="C:\lazarus\lcl\imglist.pp"/>
@@ -352,14 +352,14 @@
         <WindowIndex Value="0"/>
         <TopLine Value="47"/>
         <CursorPos X="12" Y="58"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit39>
       <Unit40>
         <Filename Value="C:\lazarus\lcl\include\custompage.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="151"/>
         <CursorPos X="1" Y="166"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit40>
       <Unit41>
         <Filename Value="C:\lazarus\lcl\lclclasses.pp"/>
@@ -367,7 +367,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="137"/>
         <CursorPos X="1" Y="149"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit41>
       <Unit42>
         <Filename Value="C:\lazarus\lcl\buttonpanel.pas"/>
@@ -375,7 +375,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="183"/>
         <CursorPos X="45" Y="194"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit42>
       <Unit43>
         <Filename Value="..\..\..\ACBr\trunk\Fontes\ACBrSerial\ACBrECF.pas"/>
@@ -383,14 +383,14 @@
         <WindowIndex Value="0"/>
         <TopLine Value="5128"/>
         <CursorPos X="1" Y="5148"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
       </Unit43>
       <Unit44>
         <Filename Value="C:\lazarus\lcl\include\wincontrol.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="4516"/>
         <CursorPos X="3" Y="4521"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit44>
       <Unit45>
         <Filename Value="..\..\..\djpdv\djmonitor\DAV.pas"/>
@@ -401,21 +401,21 @@
         <WindowIndex Value="0"/>
         <TopLine Value="997"/>
         <CursorPos X="3" Y="999"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
       </Unit45>
       <Unit46>
         <Filename Value="C:\lazarus\lcl\include\customform.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="2173"/>
         <CursorPos X="32" Y="2186"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
       </Unit46>
       <Unit47>
         <Filename Value="C:\lazarus\lcl\include\screen.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="978"/>
         <CursorPos X="1" Y="989"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit47>
       <Unit48>
         <Filename Value="C:\lazarus\lcl\forms.pp"/>
@@ -424,7 +424,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="588"/>
         <CursorPos X="31" Y="598"/>
-        <UsageCount Value="14"/>
+        <UsageCount Value="17"/>
         <Loaded Value="True"/>
       </Unit48>
       <Unit49>
@@ -433,14 +433,14 @@
         <WindowIndex Value="0"/>
         <TopLine Value="116"/>
         <CursorPos X="1" Y="128"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit49>
       <Unit50>
         <Filename Value="C:\lazarus\lcl\interfaces\win32\win32pagecontrol.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="254"/>
         <CursorPos X="1" Y="262"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit50>
       <Unit51>
         <Filename Value="C:\lazarus\lcl\interfaces\win32\win32wsforms.pp"/>
@@ -448,7 +448,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="361"/>
         <CursorPos X="1" Y="375"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
       </Unit51>
       <Unit52>
         <Filename Value="C:\lazarus\lcl\widgetset\wslclclasses.pp"/>
@@ -456,7 +456,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="421"/>
         <CursorPos X="3" Y="414"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
       </Unit52>
       <Unit53>
         <Filename Value="C:\lazarus\lcl\lclproc.pas"/>
@@ -464,28 +464,28 @@
         <WindowIndex Value="0"/>
         <TopLine Value="851"/>
         <CursorPos X="1" Y="865"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit53>
       <Unit54>
         <Filename Value="C:\lazarus\lcl\include\tabsheet.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="49"/>
         <CursorPos X="3" Y="69"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit54>
       <Unit55>
         <Filename Value="C:\lazarus\lcl\include\winapi.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="314"/>
         <CursorPos X="30" Y="322"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit55>
       <Unit56>
         <Filename Value="C:\lazarus\lcl\interfaces\win32\win32callback.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="211"/>
         <CursorPos X="14" Y="214"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit56>
       <Unit57>
         <Filename Value="..\..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
@@ -497,7 +497,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="132"/>
         <CursorPos X="1" Y="154"/>
-        <UsageCount Value="14"/>
+        <UsageCount Value="17"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit57>
@@ -506,21 +506,21 @@
         <WindowIndex Value="0"/>
         <TopLine Value="208"/>
         <CursorPos X="30" Y="219"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit58>
       <Unit59>
         <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\objpas\sysutils\sysstr.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1803"/>
         <CursorPos X="3" Y="1806"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit59>
       <Unit60>
         <Filename Value="C:\lazarus\lcl\include\customcontrol.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="79"/>
         <CursorPos X="15" Y="90"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit60>
     </Units>
     <General>
@@ -529,123 +529,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="256" Column="1" TopLine="241"/>
+        <Caret Line="244" Column="27" TopLine="237"/>
       </Position1>
       <Position2>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="54" Column="1" TopLine="45"/>
+        <Caret Line="210" Column="70" TopLine="196"/>
       </Position2>
       <Position3>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="188" Column="1" TopLine="178"/>
+        <Caret Line="227" Column="73" TopLine="214"/>
       </Position3>
       <Position4>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="225" Column="1" TopLine="215"/>
+        <Caret Line="721" Column="17" TopLine="706"/>
       </Position4>
       <Position5>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="80" Column="20" TopLine="69"/>
       </Position5>
       <Position6>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="40" Column="48" TopLine="29"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="443" Column="3" TopLine="429"/>
       </Position6>
       <Position7>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="244" Column="27" TopLine="237"/>
+        <Caret Line="754" Column="27" TopLine="747"/>
       </Position7>
       <Position8>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="210" Column="70" TopLine="196"/>
+        <Filename Value="uform1.pas"/>
+        <Caret Line="44" Column="18" TopLine="40"/>
       </Position8>
       <Position9>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="1" Column="1" TopLine="40"/>
+        <Filename Value="uform1.pas"/>
+        <Caret Line="45" Column="18" TopLine="41"/>
       </Position9>
       <Position10>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="227" Column="73" TopLine="214"/>
+        <Filename Value="uform1.pas"/>
+        <Caret Line="46" Column="18" TopLine="42"/>
       </Position10>
       <Position11>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="721" Column="17" TopLine="706"/>
+        <Filename Value="uform1.pas"/>
+        <Caret Line="48" Column="18" TopLine="44"/>
       </Position11>
       <Position12>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="80" Column="20" TopLine="69"/>
+        <Filename Value="uform1.pas"/>
+        <Caret Line="71" Column="22" TopLine="42"/>
       </Position12>
       <Position13>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="443" Column="3" TopLine="429"/>
+        <Filename Value="uform1.pas"/>
+        <Caret Line="53" Column="12" TopLine="42"/>
       </Position13>
       <Position14>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="754" Column="27" TopLine="747"/>
+        <Filename Value="uform1.pas"/>
+        <Caret Line="56" Column="12" TopLine="45"/>
       </Position14>
       <Position15>
         <Filename Value="uform1.pas"/>
-        <Caret Line="44" Column="18" TopLine="40"/>
+        <Caret Line="93" Column="8" TopLine="66"/>
       </Position15>
       <Position16>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="45" Column="18" TopLine="41"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="93" Column="17" TopLine="90"/>
       </Position16>
       <Position17>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="46" Column="18" TopLine="42"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="92" Column="17" TopLine="89"/>
       </Position17>
       <Position18>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="48" Column="18" TopLine="44"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="91" Column="17" TopLine="88"/>
       </Position18>
       <Position19>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="71" Column="22" TopLine="42"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="90" Column="17" TopLine="87"/>
       </Position19>
       <Position20>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="53" Column="12" TopLine="42"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="89" Column="17" TopLine="86"/>
       </Position20>
       <Position21>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="56" Column="12" TopLine="45"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="90" Column="17" TopLine="87"/>
       </Position21>
       <Position22>
         <Filename Value="uform1.pas"/>
-        <Caret Line="93" Column="8" TopLine="66"/>
+        <Caret Line="68" Column="15" TopLine="62"/>
       </Position22>
       <Position23>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="93" Column="17" TopLine="90"/>
+        <Filename Value="uform1.pas"/>
+        <Caret Line="69" Column="15" TopLine="63"/>
       </Position23>
       <Position24>
         <Filename Value="umainform.pas"/>
-        <Caret Line="92" Column="17" TopLine="89"/>
+        <Caret Line="90" Column="17" TopLine="87"/>
       </Position24>
       <Position25>
         <Filename Value="umainform.pas"/>
-        <Caret Line="91" Column="17" TopLine="88"/>
+        <Caret Line="89" Column="17" TopLine="86"/>
       </Position25>
       <Position26>
         <Filename Value="umainform.pas"/>
-        <Caret Line="90" Column="17" TopLine="87"/>
+        <Caret Line="88" Column="17" TopLine="85"/>
       </Position26>
       <Position27>
         <Filename Value="umainform.pas"/>
-        <Caret Line="89" Column="17" TopLine="86"/>
+        <Caret Line="87" Column="17" TopLine="84"/>
       </Position27>
       <Position28>
         <Filename Value="umainform.pas"/>
-        <Caret Line="90" Column="17" TopLine="87"/>
+        <Caret Line="88" Column="17" TopLine="85"/>
       </Position28>
       <Position29>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="68" Column="15" TopLine="62"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="87" Column="17" TopLine="84"/>
       </Position29>
       <Position30>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="69" Column="15" TopLine="63"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="80" Column="4" TopLine="78"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/components/tdi/Demo/umainform.lfm b/components/tdi/Demo/umainform.lfm
index d1ad58ff4..210ff0510 100644
--- a/components/tdi/Demo/umainform.lfm
+++ b/components/tdi/Demo/umainform.lfm
@@ -58,41 +58,33 @@ object fMainForm: TfMainForm
       ClientHeight = 363
       ClientWidth = 579
       ImageIndex = 5
-      object Edit1: TEdit
-        Left = 92
-        Height = 23
-        Top = 24
-        Width = 80
-        TabOrder = 0
-        Text = 'Edit1'
-      end
-      object Edit2: TEdit
-        Left = 92
-        Height = 23
-        Top = 73
-        Width = 80
-        TabOrder = 1
-        Text = 'Edit2'
-      end
-      object Button1: TButton
-        Left = 92
-        Height = 25
-        Top = 120
-        Width = 75
-        Caption = 'Button1'
-        TabOrder = 2
-      end
       object Label2: TLabel
         AnchorSideLeft.Control = TabSheet1
         AnchorSideLeft.Side = asrCenter
         Left = 167
         Height = 31
-        Top = 208
+        Top = 304
         Width = 244
         Alignment = taCenter
         Caption = 'This is a Fixed Page, and cannot be closed.'#13#10'You can configure it on "FixedPages" Property'
         ParentColor = False
       end
+      object IpHtmlPanel1: TIpHtmlPanel
+        Left = 0
+        Height = 290
+        Top = 0
+        Width = 579
+        Align = alTop
+        FixedTypeface = 'Courier New'
+        DefaultTypeFace = 'default'
+        DefaultFontSize = 12
+        FlagErrors = False
+        PrintSettings.MarginLeft = 0.5
+        PrintSettings.MarginTop = 0.5
+        PrintSettings.MarginRight = 0.5
+        PrintSettings.MarginBottom = 0.5
+        TabOrder = 0
+      end
     end
   end
   object pBottom: TPanel
@@ -644,11 +636,11 @@ object fMainForm: TfMainForm
     object MenuItem1: TMenuItem
       Caption = 'Forms'
       object miForm1: TMenuItem
-        Caption = 'Open Form 1'
+        Caption = 'Open New Form 1'
         OnClick = miForm1Click
       end
       object miForm2: TMenuItem
-        Caption = 'Open Form 2'
+        Caption = 'Show Already Created Form 2'
       end
       object MenuItem2: TMenuItem
         Caption = '-'
diff --git a/components/tdi/Demo/umainform.pas b/components/tdi/Demo/umainform.pas
index a779915ce..7b8139518 100644
--- a/components/tdi/Demo/umainform.pas
+++ b/components/tdi/Demo/umainform.pas
@@ -6,19 +6,17 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
-  ComCtrls, Buttons, StdCtrls, ExtCtrls, TDIClass , types;
+  ComCtrls, Buttons, StdCtrls, ExtCtrls, TDIClass , types, SynMemo, IpHtml;
 
 type
 
   { TfMainForm }
 
   TfMainForm = class(TForm)
-    Button1 : TButton ;
     cbxBackgroundCorner : TComboBox ;
-    Edit1 : TEdit ;
-    Edit2 : TEdit ;
     Image1 : TImage ;
     ImageList1 : TImageList ;
+    IpHtmlPanel1 : TIpHtmlPanel ;
     Label1 : TLabel ;
     Label2 : TLabel ;
     MainMenu1 : TMainMenu ;
diff --git a/components/tdi/Make_lrs.bat b/components/tdi/Make_lrs.bat
new file mode 100644
index 000000000..5223c5749
--- /dev/null
+++ b/components/tdi/Make_lrs.bat
@@ -0,0 +1,33 @@
+@ECHO OFF
+@ECHO OFF
+
+if "%1" == "" goto param_default
+
+if NOT EXIST %1\lazarus.exe goto error_param
+
+if NOT EXIST %1\tools\lazres.exe GOTO error_lazres
+
+del tdi.lrs
+%1\tools\lazres.exe tdi.lrs ttdinotebook.png
+
+GOTO end
+
+:param_default
+Make_lrs.bat c:\lazarus
+goto :end
+
+:error_param
+ECHO "Please Inform Lazarus folder. For instance:"
+echo.
+ECHO "Make_lrs.bat c:\lazarus"
+goto :end
+
+:error_lazres
+ECHO "Arquivo:"
+echo %1\tools\lazres.exe
+ECHO "was not found... Please compile the project \lazarus\tools\lazres.lpi"
+goto end
+
+:end
+echo "Press ENTER to leave" .
+pause
\ No newline at end of file
diff --git a/components/tdi/tdi.lrs b/components/tdi/tdi.lrs
new file mode 100644
index 000000000..c5a0074fd
--- /dev/null
+++ b/components/tdi/tdi.lrs
@@ -0,0 +1,27 @@
+LazarusResources.Add('ttdinotebook','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#24#0#0#0#24#8#6#0#0#0#224'w='#248#0
+  +#0#0#1'sRGB'#0#174#206#28#233#0#0#0#4'gAMA'#0#0#177#143#11#252'a'#5#0#0#0#9
+  +'pHYs'#0#0#14#196#0#0#14#196#1#149'+'#14#27#0#0#0#6'bKGD'#0#255#0#255#0#255
+  +#160#189#167#147#0#0#0#7'tIME'#7#216#2#27#8#14#17'5A'#235#216#0#0#1#229'IDAT'
+  +'HK'#181'V'#187'JCA'#16'='#138#133#224#23'H'#10#197#31#176'2'#160#146#248#136
+  +#230#29'c'#132#136'~'#132'hg'#16#11#197'&e0'#165#189#22#1#223'y?4W'#212'V{'
+  +#193#136#16',l|'#23'bbfa/'#155#155#189'!'#209'd`'#24#238#204#238'9gg'#216#229
+  +'v'#148'+'#134'6Zg'#27#177#25't'#7#157' rY@8r'#173#203#181#228#31#134#127#180
+  +#255'OZ'#24#129'ye'#15'JhQ'#23#128#234'2#b'#153#176'*AD`Z'#222#165'P~y'#253
+  +#150':'#175#179'E'#130'5'#146#175#154#193#251#199#23'd'#206#213#23#159#222' '
+  +':'#229#181'9'#250#22#173#138#224#227#253#19'2'#231#27#180'5'#202#215'['#175
+  +#14'9'#16#8#195'h'#28#210#157'AH'#185'oj'#192'#'#221#207'p9'#6'a'#26'3'#3#212
+  +#210#213#213'm'#181#179#165#210'O'#185#190#151'*u}'#231'x'#202'y'#158'av'#137
+  +#210#10#133';'#236'\5%'#182'f'#177#221'P'#212#159#1#175#12#247#220'`ka'#0#178
+  +#184'9'#223#207#242#27#254'>'#22#215'}'#6#22#215#188#189'Re'#210#155#236#244
+  +#204'!v'#178#15#30#29'n'#31#251#182#187'f'#145#136#30#194#234#152'A2v'#4#139
+  +#213#133'l*'#138'q'#139#29'g'#153'x'#227#4'"8'#129#198'O'#15'`sz'#25#248#180
+  +#221#131'T'#252#24#147#211'N'#21#252'<'#155#192#216#164#173'q'#2#173'b'#2#229
+  +#138#211#137#19'LL9'#144'K'#199#152'r'#14#158#207'%'#27''''#16#21'O'#217#220
+  +' PQ1'#181#131#20#139#224'M'#157#128'+&'#240'L'#242'TW1'#129#146'r'#30'eG'
+  +#144#14#153#183#129#192'i3)6OX'#153'b'#138#4'*'#139'2'#2#246#154#210'M'#14#6
+  +#151#208#170'{'#16#141#223#170'7'#185#134#224#127#215#12'x|(B$'#168'j'#17#21
+  +#255#235'Z'#129#236#4#148#164'6'#181#202#232#161'#'#163#199'N%'#184#200'+'
+  +#173#194'W'#193#213#231#186#165#200#26#176#182#255'U'#252#2#230#197#31'?'#177
+  +#153'q'#226#0#0#0#0'IEND'#174'B`'#130
+]);
diff --git a/components/tdi/tdireg.pas b/components/tdi/tdireg.pas
index 378d977f7..60feca8a7 100644
--- a/components/tdi/tdireg.pas
+++ b/components/tdi/tdireg.pas
@@ -18,6 +18,8 @@ begin
   RegisterComponents('TDI', [ TTDINoteBook ]);
 end ;
 
+initialization
+{$I tdi.lrs}
 
 end.
 
diff --git a/components/tdi/ttdinotebook.png b/components/tdi/ttdinotebook.png
new file mode 100644
index 000000000..e7021ba7b
Binary files /dev/null and b/components/tdi/ttdinotebook.png differ