diff --git a/examples/dockmanager/elasticsite/felastic.lfm b/examples/dockmanager/elasticsite/felastic.lfm
index 7150059696..272a91bc67 100644
--- a/examples/dockmanager/elasticsite/felastic.lfm
+++ b/examples/dockmanager/elasticsite/felastic.lfm
@@ -3,6 +3,7 @@ object DockingSite: TDockingSite
   Height = 163
   Top = 156
   Width = 255
+  AutoSize = True
   Caption = 'Dock Site'
   ClientHeight = 163
   ClientWidth = 255
diff --git a/examples/dockmanager/elasticsite/felastic.lrs b/examples/dockmanager/elasticsite/felastic.lrs
index b50ebe1aac..3e60fe2161 100644
--- a/examples/dockmanager/elasticsite/felastic.lrs
+++ b/examples/dockmanager/elasticsite/felastic.lrs
@@ -2,31 +2,31 @@
 
 LazarusResources.Add('TDockingSite','FORMDATA',[
   'TPF0'#12'TDockingSite'#11'DockingSite'#4'Left'#3#188#1#6'Height'#3#163#0#3'T'
-  +'op'#3#156#0#5'Width'#3#255#0#7'Caption'#6#9'Dock Site'#12'ClientHeight'#3
-  +#163#0#11'ClientWidth'#3#255#0#10'LCLVersion'#6#6'0.9.29'#7'Visible'#9#0#6'T'
-  +'Panel'#7'pnlLeft'#4'Left'#2#0#6'Height'#3#138#0#3'Top'#2#0#5'Width'#2#0#5'A'
-  +'lign'#7#6'alLeft'#7'Caption'#6#7'pnlLeft'#5'Color'#7#7'clWhite'#8'DockSite'
-  +#9#11'ParentColor'#8#8'TabOrder'#2#0#10'OnDockDrop'#7#15'pnlLeftDockDrop'#10
-  +'OnDockOver'#7#15'pnlLeftDockOver'#13'OnGetSiteInfo'#7#18'pnlLeftGetSiteInfo'
-  +#8'OnUnDock'#7#13'pnlLeftUnDock'#0#0#9'TSplitter'#9'splitLeft'#4'Left'#2#0#6
-  +'Height'#3#138#0#3'Top'#2#0#5'Width'#2#4#0#0#6'TPanel'#8'pnlRight'#4'Left'#3
-  +#255#0#6'Height'#3#138#0#3'Top'#2#0#5'Width'#2#0#5'Align'#7#7'alRight'#7'Cap'
-  +'tion'#6#8'pnlRight'#5'Color'#7#6'clAqua'#8'DockSite'#9#11'ParentColor'#8#8
-  +'TabOrder'#2#2#10'OnDockDrop'#7#15'pnlLeftDockDrop'#10'OnDockOver'#7#15'pnlL'
-  +'eftDockOver'#13'OnGetSiteInfo'#7#18'pnlLeftGetSiteInfo'#8'OnUnDock'#7#13'pn'
-  +'lLeftUnDock'#0#0#6'TPanel'#9'pnlBottom'#4'Left'#2#0#6'Height'#2#1#3'Top'#3
-  +#142#0#5'Width'#3#255#0#5'Align'#7#8'alBottom'#7'Caption'#6#9'pnlBottom'#8'D'
-  +'ockSite'#9#8'TabOrder'#2#3#10'OnDockDrop'#7#15'pnlLeftDockDrop'#10'OnDockOv'
-  +'er'#7#15'pnlLeftDockOver'#13'OnGetSiteInfo'#7#18'pnlLeftGetSiteInfo'#8'OnUn'
-  +'Dock'#7#13'pnlLeftUnDock'#0#0#9'TSplitter'#10'splitRight'#4'Left'#3#251#0#6
-  +'Height'#3#138#0#3'Top'#2#0#5'Width'#2#4#5'Align'#7#7'alRight'#12'ResizeAnch'
-  +'or'#7#7'akRight'#0#0#10'TStatusBar'#10'StatusBar1'#4'Left'#2#0#6'Height'#2
-  +#20#3'Top'#3#143#0#5'Width'#3#255#0#6'Panels'#14#0#0#0#6'TPanel'#6'Panel1'#4
-  +'Left'#2#4#6'Height'#3#138#0#3'Top'#2#0#5'Width'#3#247#0#5'Align'#7#8'alClie'
-  +'nt'#7'Caption'#6#6'Client'#12'ClientHeight'#3#138#0#11'ClientWidth'#3#247#0
-  +#8'TabOrder'#2#6#0#7'TButton'#9'buNewForm'#4'Left'#2'`'#6'Height'#2#20#3'Top'
-  +#2#16#5'Width'#2'>'#7'Caption'#6#8'New Form'#7'OnClick'#7#14'buNewFormClick'
-  +#8'TabOrder'#2#0#0#0#0#9'TSplitter'#11'splitBottom'#6'Cursor'#7#8'crVSplit'#4
-  +'Left'#2#0#6'Height'#2#4#3'Top'#3#138#0#5'Width'#3#255#0#5'Align'#7#8'alBott'
-  +'om'#12'ResizeAnchor'#7#8'akBottom'#0#0#0
+  +'op'#3#156#0#5'Width'#3#255#0#8'AutoSize'#9#7'Caption'#6#9'Dock Site'#12'Cli'
+  +'entHeight'#3#163#0#11'ClientWidth'#3#255#0#10'LCLVersion'#6#6'0.9.29'#7'Vis'
+  +'ible'#9#0#6'TPanel'#7'pnlLeft'#4'Left'#2#0#6'Height'#3#138#0#3'Top'#2#0#5'W'
+  +'idth'#2#0#5'Align'#7#6'alLeft'#7'Caption'#6#7'pnlLeft'#5'Color'#7#7'clWhite'
+  +#8'DockSite'#9#11'ParentColor'#8#8'TabOrder'#2#0#10'OnDockDrop'#7#15'pnlLeft'
+  +'DockDrop'#10'OnDockOver'#7#15'pnlLeftDockOver'#13'OnGetSiteInfo'#7#18'pnlLe'
+  +'ftGetSiteInfo'#8'OnUnDock'#7#13'pnlLeftUnDock'#0#0#9'TSplitter'#9'splitLeft'
+  +#4'Left'#2#0#6'Height'#3#138#0#3'Top'#2#0#5'Width'#2#4#0#0#6'TPanel'#8'pnlRi'
+  +'ght'#4'Left'#3#255#0#6'Height'#3#138#0#3'Top'#2#0#5'Width'#2#0#5'Align'#7#7
+  +'alRight'#7'Caption'#6#8'pnlRight'#5'Color'#7#6'clAqua'#8'DockSite'#9#11'Par'
+  +'entColor'#8#8'TabOrder'#2#2#10'OnDockDrop'#7#15'pnlLeftDockDrop'#10'OnDockO'
+  +'ver'#7#15'pnlLeftDockOver'#13'OnGetSiteInfo'#7#18'pnlLeftGetSiteInfo'#8'OnU'
+  +'nDock'#7#13'pnlLeftUnDock'#0#0#6'TPanel'#9'pnlBottom'#4'Left'#2#0#6'Height'
+  +#2#1#3'Top'#3#142#0#5'Width'#3#255#0#5'Align'#7#8'alBottom'#7'Caption'#6#9'p'
+  +'nlBottom'#8'DockSite'#9#8'TabOrder'#2#3#10'OnDockDrop'#7#15'pnlLeftDockDrop'
+  +#10'OnDockOver'#7#15'pnlLeftDockOver'#13'OnGetSiteInfo'#7#18'pnlLeftGetSiteI'
+  +'nfo'#8'OnUnDock'#7#13'pnlLeftUnDock'#0#0#9'TSplitter'#10'splitRight'#4'Left'
+  +#3#251#0#6'Height'#3#138#0#3'Top'#2#0#5'Width'#2#4#5'Align'#7#7'alRight'#12
+  +'ResizeAnchor'#7#7'akRight'#0#0#10'TStatusBar'#10'StatusBar1'#4'Left'#2#0#6
+  +'Height'#2#20#3'Top'#3#143#0#5'Width'#3#255#0#6'Panels'#14#0#0#0#6'TPanel'#6
+  +'Panel1'#4'Left'#2#4#6'Height'#3#138#0#3'Top'#2#0#5'Width'#3#247#0#5'Align'#7
+  +#8'alClient'#7'Caption'#6#6'Client'#12'ClientHeight'#3#138#0#11'ClientWidth'
+  +#3#247#0#8'TabOrder'#2#6#0#7'TButton'#9'buNewForm'#4'Left'#2'`'#6'Height'#2
+  +#20#3'Top'#2#16#5'Width'#2'>'#7'Caption'#6#8'New Form'#7'OnClick'#7#14'buNew'
+  +'FormClick'#8'TabOrder'#2#0#0#0#0#9'TSplitter'#11'splitBottom'#6'Cursor'#7#8
+  +'crVSplit'#4'Left'#2#0#6'Height'#2#4#3'Top'#3#138#0#5'Width'#3#255#0#5'Align'
+  +#7#8'alBottom'#12'ResizeAnchor'#7#8'akBottom'#0#0#0
 ]);
diff --git a/examples/dockmanager/elasticsite/felastic.pas b/examples/dockmanager/elasticsite/felastic.pas
index 216819c1ef..78faea8c0f 100644
--- a/examples/dockmanager/elasticsite/felastic.pas
+++ b/examples/dockmanager/elasticsite/felastic.pas
@@ -56,9 +56,10 @@ type
       NewTarget: TWinControl; var Allow: Boolean);
   private
     FAutoExpand: boolean;
+    procedure SetAutoExpand(NewValue: boolean);
   public
   published
-    property AutoExpand: boolean read FAutoExpand write FAutoExpand;
+    property AutoExpand: boolean read FAutoExpand write SetAutoExpand default True;
   end;
 
 var
@@ -288,9 +289,14 @@ begin
   end;
 end;
 
+procedure TDockingSite.SetAutoExpand(NewValue: boolean);
+begin
+  FAutoExpand:=NewValue;
+end;
+
 initialization
   {$I felastic.lrs}
-  DefaultDockTreeClass := TEasyTree;
+  DefaultDockManagerClass := TEasyTree;
 
 end.
 
diff --git a/examples/dockmanager/elasticsite/project1.lpi b/examples/dockmanager/elasticsite/project1.lpi
index 6d0d5a10ca..35e4e2c1cd 100644
--- a/examples/dockmanager/elasticsite/project1.lpi
+++ b/examples/dockmanager/elasticsite/project1.lpi
@@ -41,7 +41,7 @@
         <UnitName Value="project1"/>
         <CursorPos X="56" Y="10"/>
         <TopLine Value="1"/>
-        <UsageCount Value="41"/>
+        <UsageCount Value="42"/>
       </Unit0>
       <Unit1>
         <Filename Value="felastic.pas"/>
@@ -49,12 +49,12 @@
         <ComponentName Value="DockingSite"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="fElastic"/>
-        <CursorPos X="10" Y="204"/>
-        <TopLine Value="178"/>
+        <CursorPos X="3" Y="294"/>
+        <TopLine Value="255"/>
         <EditorIndex Value="0"/>
-        <UsageCount Value="41"/>
+        <UsageCount Value="42"/>
         <Bookmarks Count="1">
-          <Item0 X="1" Y="201" ID="1"/>
+          <Item0 X="1" Y="202" ID="1"/>
         </Bookmarks>
         <Loaded Value="True"/>
       </Unit1>
@@ -69,10 +69,10 @@
       </Unit2>
       <Unit3>
         <Filename Value="..\..\..\lcl\include\wincontrol.inc"/>
-        <CursorPos X="3" Y="5195"/>
-        <TopLine Value="5186"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="1"/>
         <EditorIndex Value="6"/>
-        <UsageCount Value="19"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
       </Unit3>
       <Unit4>
@@ -80,7 +80,7 @@
         <CursorPos X="1" Y="606"/>
         <TopLine Value="582"/>
         <EditorIndex Value="9"/>
-        <UsageCount Value="19"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
       </Unit4>
       <Unit5>
@@ -88,19 +88,18 @@
         <CursorPos X="1" Y="1125"/>
         <TopLine Value="1101"/>
         <EditorIndex Value="8"/>
-        <UsageCount Value="19"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
       </Unit5>
       <Unit6>
         <Filename Value="ftestpanels.pas"/>
-        <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="fTestPanels"/>
         <CursorPos X="1" Y="85"/>
         <TopLine Value="43"/>
         <EditorIndex Value="4"/>
-        <UsageCount Value="36"/>
+        <UsageCount Value="37"/>
         <Loaded Value="True"/>
       </Unit6>
       <Unit7>
@@ -113,10 +112,10 @@
       <Unit8>
         <Filename Value="..\..\..\lcl\controls.pp"/>
         <UnitName Value="Controls"/>
-        <CursorPos X="15" Y="1780"/>
-        <TopLine Value="1756"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="1"/>
         <EditorIndex Value="5"/>
-        <UsageCount Value="16"/>
+        <UsageCount Value="17"/>
         <Loaded Value="True"/>
       </Unit8>
       <Unit9>
@@ -125,7 +124,7 @@
         <CursorPos X="1" Y="694"/>
         <TopLine Value="694"/>
         <EditorIndex Value="2"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="13"/>
         <Loaded Value="True"/>
       </Unit9>
       <Unit10>
@@ -146,7 +145,7 @@
         <CursorPos X="3" Y="37"/>
         <TopLine Value="13"/>
         <EditorIndex Value="3"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="13"/>
         <Loaded Value="True"/>
       </Unit12>
       <Unit13>
@@ -158,10 +157,10 @@
       <Unit14>
         <Filename Value="..\..\..\lcl\ldocktree.pas"/>
         <UnitName Value="LDockTree"/>
-        <CursorPos X="15" Y="93"/>
-        <TopLine Value="67"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="1"/>
         <EditorIndex Value="7"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="13"/>
         <Loaded Value="True"/>
       </Unit14>
       <Unit15>
@@ -169,130 +168,130 @@
         <CursorPos X="10" Y="150"/>
         <TopLine Value="126"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit15>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="28">
+    <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="felastic.pas"/>
-        <Caret Line="140" Column="15" TopLine="117"/>
+        <Caret Line="141" Column="1" TopLine="117"/>
       </Position1>
       <Position2>
-        <Filename Value="felastic.pas"/>
-        <Caret Line="141" Column="1" TopLine="117"/>
+        <Filename Value="..\..\..\lcl\include\control.inc"/>
+        <Caret Line="1125" Column="1" TopLine="1101"/>
       </Position2>
       <Position3>
-        <Filename Value="..\package\easydocksite.pas"/>
-        <Caret Line="659" Column="1" TopLine="612"/>
+        <Filename Value="felastic.pas"/>
+        <Caret Line="133" Column="5" TopLine="117"/>
       </Position3>
       <Position4>
-        <Filename Value="..\package\easydocksite.pas"/>
-        <Caret Line="641" Column="1" TopLine="618"/>
+        <Filename Value="felastic.pas"/>
+        <Caret Line="143" Column="1" TopLine="119"/>
       </Position4>
       <Position5>
         <Filename Value="felastic.pas"/>
-        <Caret Line="141" Column="1" TopLine="117"/>
+        <Caret Line="146" Column="1" TopLine="122"/>
       </Position5>
       <Position6>
-        <Filename Value="..\..\..\lcl\include\control.inc"/>
-        <Caret Line="1125" Column="1" TopLine="1101"/>
+        <Filename Value="felastic.pas"/>
+        <Caret Line="147" Column="1" TopLine="123"/>
       </Position6>
       <Position7>
         <Filename Value="felastic.pas"/>
-        <Caret Line="133" Column="5" TopLine="117"/>
+        <Caret Line="148" Column="1" TopLine="124"/>
       </Position7>
       <Position8>
         <Filename Value="felastic.pas"/>
-        <Caret Line="143" Column="1" TopLine="119"/>
+        <Caret Line="150" Column="1" TopLine="126"/>
       </Position8>
       <Position9>
         <Filename Value="felastic.pas"/>
-        <Caret Line="146" Column="1" TopLine="122"/>
+        <Caret Line="136" Column="19" TopLine="117"/>
       </Position9>
       <Position10>
         <Filename Value="felastic.pas"/>
-        <Caret Line="147" Column="1" TopLine="123"/>
+        <Caret Line="218" Column="64" TopLine="171"/>
       </Position10>
       <Position11>
         <Filename Value="felastic.pas"/>
-        <Caret Line="148" Column="1" TopLine="124"/>
+        <Caret Line="77" Column="15" TopLine="57"/>
       </Position11>
       <Position12>
         <Filename Value="felastic.pas"/>
-        <Caret Line="150" Column="1" TopLine="126"/>
+        <Caret Line="75" Column="13" TopLine="51"/>
       </Position12>
       <Position13>
         <Filename Value="felastic.pas"/>
-        <Caret Line="136" Column="19" TopLine="117"/>
+        <Caret Line="76" Column="13" TopLine="51"/>
       </Position13>
       <Position14>
         <Filename Value="felastic.pas"/>
-        <Caret Line="218" Column="64" TopLine="171"/>
+        <Caret Line="71" Column="15" TopLine="51"/>
       </Position14>
       <Position15>
         <Filename Value="felastic.pas"/>
-        <Caret Line="77" Column="15" TopLine="57"/>
+        <Caret Line="75" Column="12" TopLine="51"/>
       </Position15>
       <Position16>
         <Filename Value="felastic.pas"/>
-        <Caret Line="75" Column="13" TopLine="51"/>
+        <Caret Line="78" Column="41" TopLine="51"/>
       </Position16>
       <Position17>
         <Filename Value="felastic.pas"/>
-        <Caret Line="76" Column="13" TopLine="51"/>
+        <Caret Line="77" Column="41" TopLine="51"/>
       </Position17>
       <Position18>
         <Filename Value="felastic.pas"/>
-        <Caret Line="71" Column="15" TopLine="51"/>
+        <Caret Line="105" Column="18" TopLine="71"/>
       </Position18>
       <Position19>
         <Filename Value="felastic.pas"/>
-        <Caret Line="75" Column="12" TopLine="51"/>
+        <Caret Line="261" Column="22" TopLine="236"/>
       </Position19>
       <Position20>
         <Filename Value="felastic.pas"/>
-        <Caret Line="78" Column="41" TopLine="51"/>
+        <Caret Line="61" Column="34" TopLine="25"/>
       </Position20>
       <Position21>
-        <Filename Value="felastic.pas"/>
-        <Caret Line="77" Column="41" TopLine="51"/>
+        <Filename Value="..\..\..\lcl\controls.pp"/>
+        <Caret Line="1159" Column="27" TopLine="1112"/>
       </Position21>
       <Position22>
         <Filename Value="felastic.pas"/>
-        <Caret Line="105" Column="18" TopLine="71"/>
+        <Caret Line="201" Column="22" TopLine="173"/>
       </Position22>
       <Position23>
         <Filename Value="felastic.pas"/>
-        <Caret Line="261" Column="22" TopLine="236"/>
+        <Caret Line="206" Column="1" TopLine="173"/>
       </Position23>
       <Position24>
         <Filename Value="felastic.pas"/>
-        <Caret Line="61" Column="34" TopLine="25"/>
+        <Caret Line="208" Column="11" TopLine="181"/>
       </Position24>
       <Position25>
-        <Filename Value="..\..\..\lcl\controls.pp"/>
-        <Caret Line="1159" Column="27" TopLine="1112"/>
+        <Filename Value="felastic.pas"/>
+        <Caret Line="209" Column="18" TopLine="181"/>
       </Position25>
       <Position26>
         <Filename Value="felastic.pas"/>
-        <Caret Line="201" Column="22" TopLine="173"/>
+        <Caret Line="68" Column="1" TopLine="55"/>
       </Position26>
       <Position27>
         <Filename Value="felastic.pas"/>
-        <Caret Line="206" Column="1" TopLine="173"/>
+        <Caret Line="293" Column="10" TopLine="249"/>
       </Position27>
       <Position28>
-        <Filename Value="felastic.pas"/>
-        <Caret Line="208" Column="11" TopLine="181"/>
+        <Filename Value="..\..\..\lcl\controls.pp"/>
+        <Caret Line="2341" Column="28" TopLine="2317"/>
       </Position28>
       <Position29>
-        <Filename Value="felastic.pas"/>
-        <Caret Line="209" Column="18" TopLine="181"/>
+        <Filename Value="..\..\..\lcl\controls.pp"/>
+        <Caret Line="2191" Column="25" TopLine="2158"/>
       </Position29>
       <Position30>
-        <Filename Value="..\..\..\lcl\include\wincontrol.inc"/>
-        <Caret Line="5195" Column="3" TopLine="5186"/>
+        <Filename Value="felastic.pas"/>
+        <Caret Line="59" Column="48" TopLine="25"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>
@@ -314,6 +313,12 @@
     </Other>
   </CompilerOptions>
   <Debugging>
+    <BreakPoints Count="1">
+      <Item1>
+        <Source Value="felastic.pas"/>
+        <Line Value="294"/>
+      </Item1>
+    </BreakPoints>
     <Exceptions Count="3">
       <Item1>
         <Name Value="EAbort"/>
diff --git a/examples/dockmanager/elasticsite/project1.lpr b/examples/dockmanager/elasticsite/project1.lpr
index 2af5f5310b..f0cd30f831 100644
--- a/examples/dockmanager/elasticsite/project1.lpr
+++ b/examples/dockmanager/elasticsite/project1.lpr
@@ -7,8 +7,7 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, fElastic, EasyDockMgr, LResources, fTestPanels
-  { you can add units after this };
+  Forms, fElastic, EasyDockMgr, LResources;
 
 {$IFDEF WINDOWS}{$R project1.rc}{$ENDIF}
 
@@ -16,7 +15,6 @@ begin
   {$I project1.lrs}
   Application.Initialize;
   Application.CreateForm(TDockingSite, DockingSite);
-  Application.CreateForm(TForm1, Form1);
   Application.Run;
 end.