diff --git a/examples/dockmanager/elasticsite/MakeSite.lpi b/examples/dockmanager/elasticsite/MakeSite.lpi
index ec65a5d612..abb8aea7bf 100644
--- a/examples/dockmanager/elasticsite/MakeSite.lpi
+++ b/examples/dockmanager/elasticsite/MakeSite.lpi
@@ -4,10 +4,10 @@
     <PathDelim Value="\"/>
     <Version Value="7"/>
     <General>
+      <SessionStorage Value="InIDEConfig"/>
       <MainUnit Value="0"/>
       <TargetFileExt Value=".exe"/>
       <UseXPManifest Value="True"/>
-      <ActiveEditorIndexAtStart Value="1"/>
     </General>
     <VersionInfo>
       <ProjectVersion Value=""/>
@@ -21,7 +21,7 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
     <RequiredPackages Count="2">
@@ -32,14 +32,11 @@
         <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="49">
+    <Units Count="3">
       <Unit0>
         <Filename Value="MakeSite.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="MakeSite"/>
-        <CursorPos X="1" Y="14"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="101"/>
       </Unit0>
       <Unit1>
         <Filename Value="fmastersite.pas"/>
@@ -47,477 +44,16 @@
         <ComponentName Value="MasterSite"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="fMasterSite"/>
-        <CursorPos X="1" Y="52"/>
-        <TopLine Value="28"/>
-        <EditorIndex Value="0"/>
-        <UsageCount Value="101"/>
-        <Loaded Value="True"/>
       </Unit1>
       <Unit2>
-        <Filename Value="..\package\umakesite.pas"/>
-        <UnitName Value="uMakeSite"/>
-        <CursorPos X="1" Y="480"/>
-        <TopLine Value="457"/>
-        <EditorIndex Value="4"/>
-        <UsageCount Value="84"/>
-        <Bookmarks Count="1">
-          <Item0 X="1" Y="342" ID="2"/>
-        </Bookmarks>
-        <Loaded Value="True"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="..\..\..\lcl\controls.pp"/>
-        <UnitName Value="Controls"/>
-        <CursorPos X="15" Y="1790"/>
-        <TopLine Value="1767"/>
-        <EditorIndex Value="8"/>
-        <UsageCount Value="49"/>
-        <Loaded Value="True"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="..\..\..\lcl\extctrls.pp"/>
-        <UnitName Value="ExtCtrls"/>
-        <CursorPos X="24" Y="1109"/>
-        <TopLine Value="1086"/>
-        <UsageCount Value="9"/>
-      </Unit4>
-      <Unit5>
-        <Filename Value="..\package\felasticsite.pas"/>
-        <ComponentName Value="DockingSite"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="fElasticSite"/>
-        <CursorPos X="5" Y="340"/>
-        <TopLine Value="295"/>
-        <UsageCount Value="23"/>
-      </Unit5>
-      <Unit6>
-        <Filename Value="..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\objpas\classes\classesh.inc"/>
-        <CursorPos X="15" Y="822"/>
-        <TopLine Value="798"/>
-        <UsageCount Value="21"/>
-      </Unit6>
-      <Unit7>
         <Filename Value="fclientform.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="ViewWindow"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="fClientForm"/>
-        <CursorPos X="10" Y="38"/>
-        <TopLine Value="12"/>
-        <UsageCount Value="101"/>
-      </Unit7>
-      <Unit8>
-        <Filename Value="..\..\..\lcl\include\winapih.inc"/>
-        <CursorPos X="10" Y="287"/>
-        <TopLine Value="263"/>
-        <UsageCount Value="15"/>
-      </Unit8>
-      <Unit9>
-        <Filename Value="..\..\..\lcl\include\intfbaselcl.inc"/>
-        <CursorPos X="3" Y="32"/>
-        <TopLine Value="29"/>
-        <UsageCount Value="15"/>
-      </Unit9>
-      <Unit10>
-        <Filename Value="..\..\..\lcl\include\lclintfh.inc"/>
-        <CursorPos X="10" Y="40"/>
-        <TopLine Value="16"/>
-        <UsageCount Value="15"/>
-      </Unit10>
-      <Unit11>
-        <Filename Value="..\package\easydocksite.pas"/>
-        <UnitName Value="EasyDockSite"/>
-        <CursorPos X="49" Y="1142"/>
-        <TopLine Value="1112"/>
-        <EditorIndex Value="5"/>
-        <UsageCount Value="48"/>
-        <Bookmarks Count="1">
-          <Item0 X="1" Y="1059" ID="1"/>
-        </Bookmarks>
-        <Loaded Value="True"/>
-      </Unit11>
-      <Unit12>
-        <Filename Value="..\..\..\lcl\forms.pp"/>
-        <UnitName Value="Forms"/>
-        <CursorPos X="17" Y="647"/>
-        <TopLine Value="624"/>
-        <UsageCount Value="42"/>
-      </Unit12>
-      <Unit13>
-        <Filename Value="..\..\..\lcl\include\customform.inc"/>
-        <CursorPos X="17" Y="1593"/>
-        <TopLine Value="1571"/>
-        <UsageCount Value="20"/>
-      </Unit13>
-      <Unit14>
-        <Filename Value="..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\objpash.inc"/>
-        <CursorPos X="23" Y="151"/>
-        <TopLine Value="128"/>
-        <UsageCount Value="6"/>
-      </Unit14>
-      <Unit15>
-        <Filename Value="..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\objpas\classes\cregist.inc"/>
-        <CursorPos X="3" Y="92"/>
-        <TopLine Value="88"/>
-        <UsageCount Value="6"/>
-      </Unit15>
-      <Unit16>
-        <Filename Value="..\package\dockhandle.pas"/>
-        <UnitName Value="DockHandle"/>
-        <CursorPos X="20" Y="22"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="19"/>
-      </Unit16>
-      <Unit17>
-        <Filename Value="..\..\..\lcl\include\customimage.inc"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="213"/>
-        <UsageCount Value="7"/>
-      </Unit17>
-      <Unit18>
-        <Filename Value="..\package\ffloatingsite.pas"/>
-        <ComponentName Value="FloatingSite"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="fFloatingSite"/>
-        <CursorPos X="33" Y="145"/>
-        <TopLine Value="140"/>
-        <EditorIndex Value="3"/>
-        <UsageCount Value="46"/>
-        <Loaded Value="True"/>
-      </Unit18>
-      <Unit19>
-        <Filename Value="..\package\fdockbook.pas"/>
-        <ComponentName Value="EasyDockBook"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="fDockBook"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="7"/>
-        <UsageCount Value="44"/>
-        <Loaded Value="True"/>
-      </Unit19>
-      <Unit20>
-        <Filename Value="..\package\easydockmgr.pas"/>
-        <UnitName Value="EasyDockMgr"/>
-        <CursorPos X="7" Y="10"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="31"/>
-      </Unit20>
-      <Unit21>
-        <Filename Value="..\package\fpageframe.pas"/>
-        <ComponentName Value="PageFrame"/>
-        <ResourceBaseClass Value="Frame"/>
-        <UnitName Value="fPageFrame"/>
-        <CursorPos X="1" Y="311"/>
-        <TopLine Value="271"/>
-        <UsageCount Value="15"/>
-        <Bookmarks Count="1">
-          <Item0 X="1" Y="128" ID="1"/>
-        </Bookmarks>
-      </Unit21>
-      <Unit22>
-        <Filename Value="..\..\..\lcl\include\customframe.inc"/>
-        <CursorPos X="3" Y="177"/>
-        <TopLine Value="135"/>
-        <UsageCount Value="15"/>
-      </Unit22>
-      <Unit23>
-        <Filename Value="..\..\..\lcl\lcltype.pp"/>
-        <UnitName Value="LCLType"/>
-        <CursorPos X="3" Y="118"/>
-        <TopLine Value="95"/>
-        <UsageCount Value="9"/>
-      </Unit23>
-      <Unit24>
-        <Filename Value="..\..\..\lcl\lmessages.pp"/>
-        <UnitName Value="LMessages"/>
-        <CursorPos X="3" Y="769"/>
-        <TopLine Value="746"/>
-        <UsageCount Value="9"/>
-      </Unit24>
-      <Unit25>
-        <Filename Value="..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\objpas\classes\compon.inc"/>
-        <CursorPos X="3" Y="161"/>
-        <TopLine Value="158"/>
-        <UsageCount Value="15"/>
-      </Unit25>
-      <Unit26>
-        <Filename Value="..\..\..\lcl\include\control.inc"/>
-        <CursorPos X="1" Y="2686"/>
-        <TopLine Value="2660"/>
-        <EditorIndex Value="2"/>
-        <UsageCount Value="26"/>
-        <Loaded Value="True"/>
-      </Unit26>
-      <Unit27>
-        <Filename Value="..\..\..\lcl\include\wincontrol.inc"/>
-        <CursorPos X="7" Y="5235"/>
-        <TopLine Value="5228"/>
-        <EditorIndex Value="6"/>
-        <UsageCount Value="26"/>
-        <Loaded Value="True"/>
-      </Unit27>
-      <Unit28>
-        <Filename Value="..\..\..\lcl\include\dragdock.inc"/>
-        <CursorPos X="10" Y="21"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="25"/>
-      </Unit28>
-      <Unit29>
-        <Filename Value="..\..\..\lcl\include\dragmanager.inc"/>
-        <CursorPos X="1" Y="730"/>
-        <TopLine Value="687"/>
-        <UsageCount Value="20"/>
-      </Unit29>
-      <Unit30>
-        <Filename Value="..\..\..\lcl\include\application.inc"/>
-        <CursorPos X="1" Y="2076"/>
-        <TopLine Value="2053"/>
-        <UsageCount Value="27"/>
-      </Unit30>
-      <Unit31>
-        <Filename Value="..\..\..\lcl\include\toolbutton.inc"/>
-        <CursorPos X="1" Y="700"/>
-        <TopLine Value="677"/>
-        <UsageCount Value="16"/>
-      </Unit31>
-      <Unit32>
-        <Filename Value="..\..\..\lcl\include\customcontrol.inc"/>
-        <CursorPos X="17" Y="113"/>
-        <TopLine Value="92"/>
-        <UsageCount Value="11"/>
-      </Unit32>
-      <Unit33>
-        <Filename Value="..\package\zoneheader.inc"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="19"/>
-      </Unit33>
-      <Unit34>
-        <Filename Value="..\..\..\lcl\lclproc.pas"/>
-        <UnitName Value="LCLProc"/>
-        <CursorPos X="1" Y="2109"/>
-        <TopLine Value="2086"/>
-        <UsageCount Value="17"/>
-      </Unit34>
-      <Unit35>
-        <Filename Value="..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\objpas\sysutils\sysstrh.inc"/>
-        <CursorPos X="29" Y="123"/>
-        <TopLine Value="123"/>
-        <UsageCount Value="17"/>
-      </Unit35>
-      <Unit36>
-        <Filename Value="..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\objpas\sysutils\sysstr.inc"/>
-        <CursorPos X="11" Y="915"/>
-        <TopLine Value="914"/>
-        <UsageCount Value="17"/>
-      </Unit36>
-      <Unit37>
-        <Filename Value="..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\objpas\sysutils\sysformt.inc"/>
-        <CursorPos X="12" Y="115"/>
-        <TopLine Value="97"/>
-        <UsageCount Value="17"/>
-      </Unit37>
-      <Unit38>
-        <Filename Value="..\..\..\lcl\ldockctrl.pas"/>
-        <UnitName Value="LDockCtrl"/>
-        <CursorPos X="1" Y="40"/>
-        <TopLine Value="19"/>
-        <UsageCount Value="10"/>
-      </Unit38>
-      <Unit39>
-        <Filename Value="..\..\..\components\jcf2\Utils\Delay.pas"/>
-        <UnitName Value="Delay"/>
-        <CursorPos X="16" Y="62"/>
-        <TopLine Value="53"/>
-        <UsageCount Value="10"/>
-      </Unit39>
-      <Unit40>
-        <Filename Value="..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\objpas\classes\streams.inc"/>
-        <CursorPos X="3" Y="654"/>
-        <TopLine Value="621"/>
-        <UsageCount Value="12"/>
-      </Unit40>
-      <Unit41>
-        <Filename Value="..\..\..\lcl\lclmessageglue.pas"/>
-        <UnitName Value="LCLMessageGlue"/>
-        <CursorPos X="1" Y="109"/>
-        <TopLine Value="86"/>
-        <UsageCount Value="10"/>
-      </Unit41>
-      <Unit42>
-        <Filename Value="..\..\..\lcl\graphtype.pp"/>
-        <UnitName Value="GraphType"/>
-        <CursorPos X="1" Y="1611"/>
-        <TopLine Value="1588"/>
-        <UsageCount Value="11"/>
-      </Unit42>
-      <Unit43>
-        <Filename Value="MakeSite.lrs"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="10"/>
-      </Unit43>
-      <Unit44>
-        <Filename Value="..\..\..\lcl\interfaces\win32\win32callback.inc"/>
-        <CursorPos X="1" Y="1223"/>
-        <TopLine Value="1200"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="11"/>
-        <Loaded Value="True"/>
-      </Unit44>
-      <Unit45>
-        <Filename Value="..\..\..\lcl\include\buttoncontrol.inc"/>
-        <CursorPos X="1" Y="73"/>
-        <TopLine Value="49"/>
-        <UsageCount Value="11"/>
-      </Unit45>
-      <Unit46>
-        <Filename Value="..\..\..\lcl\include\buttons.inc"/>
-        <CursorPos X="6" Y="158"/>
-        <TopLine Value="142"/>
-        <UsageCount Value="10"/>
-      </Unit46>
-      <Unit47>
-        <Filename Value="..\..\..\lcl\include\picture.inc"/>
-        <CursorPos X="1" Y="652"/>
-        <TopLine Value="629"/>
-        <UsageCount Value="11"/>
-      </Unit47>
-      <Unit48>
-        <Filename Value="..\..\..\lcl\graphics.pp"/>
-        <UnitName Value="Graphics"/>
-        <CursorPos X="3" Y="877"/>
-        <TopLine Value="890"/>
-        <UsageCount Value="10"/>
-      </Unit48>
+      </Unit2>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
-      <Position1>
-        <Filename Value="..\package\easydocksite.pas"/>
-        <Caret Line="1098" Column="69" TopLine="1074"/>
-      </Position1>
-      <Position2>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="207" Column="1" TopLine="184"/>
-      </Position2>
-      <Position3>
-        <Filename Value="fmastersite.pas"/>
-        <Caret Line="52" Column="1" TopLine="28"/>
-      </Position3>
-      <Position4>
-        <Filename Value="..\package\easydocksite.pas"/>
-        <Caret Line="1021" Column="15" TopLine="1008"/>
-      </Position4>
-      <Position5>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="207" Column="1" TopLine="184"/>
-      </Position5>
-      <Position6>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="155" Column="7" TopLine="132"/>
-      </Position6>
-      <Position7>
-        <Filename Value="..\package\easydocksite.pas"/>
-        <Caret Line="155" Column="31" TopLine="132"/>
-      </Position7>
-      <Position8>
-        <Filename Value="fmastersite.pas"/>
-        <Caret Line="46" Column="17" TopLine="28"/>
-      </Position8>
-      <Position9>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="623" Column="48" TopLine="586"/>
-      </Position9>
-      <Position10>
-        <Filename Value="fmastersite.pas"/>
-        <Caret Line="52" Column="1" TopLine="28"/>
-      </Position10>
-      <Position11>
-        <Filename Value="fmastersite.pas"/>
-        <Caret Line="41" Column="20" TopLine="28"/>
-      </Position11>
-      <Position12>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="227" Column="20" TopLine="211"/>
-      </Position12>
-      <Position13>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="614" Column="10" TopLine="597"/>
-      </Position13>
-      <Position14>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="836" Column="38" TopLine="802"/>
-      </Position14>
-      <Position15>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="838" Column="33" TopLine="805"/>
-      </Position15>
-      <Position16>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="227" Column="20" TopLine="211"/>
-      </Position16>
-      <Position17>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="479" Column="1" TopLine="457"/>
-      </Position17>
-      <Position18>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="841" Column="46" TopLine="805"/>
-      </Position18>
-      <Position19>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="480" Column="16" TopLine="451"/>
-      </Position19>
-      <Position20>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="434" Column="13" TopLine="412"/>
-      </Position20>
-      <Position21>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="475" Column="12" TopLine="465"/>
-      </Position21>
-      <Position22>
-        <Filename Value="fmastersite.pas"/>
-        <Caret Line="52" Column="1" TopLine="28"/>
-      </Position22>
-      <Position23>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="480" Column="1" TopLine="457"/>
-      </Position23>
-      <Position24>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="482" Column="1" TopLine="459"/>
-      </Position24>
-      <Position25>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="483" Column="1" TopLine="460"/>
-      </Position25>
-      <Position26>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="497" Column="1" TopLine="474"/>
-      </Position26>
-      <Position27>
-        <Filename Value="..\package\umakesite.pas"/>
-        <Caret Line="480" Column="1" TopLine="457"/>
-      </Position27>
-      <Position28>
-        <Filename Value="..\package\easydocksite.pas"/>
-        <Caret Line="1147" Column="21" TopLine="1112"/>
-      </Position28>
-      <Position29>
-        <Filename Value="..\..\..\lcl\interfaces\win32\win32callback.inc"/>
-        <Caret Line="1223" Column="1" TopLine="1200"/>
-      </Position29>
-      <Position30>
-        <Filename Value="..\package\easydocksite.pas"/>
-        <Caret Line="1142" Column="49" TopLine="1112"/>
-      </Position30>
-    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="8"/>
@@ -533,23 +69,4 @@
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
-  <Debugging>
-    <BreakPoints Count="1">
-      <Item1>
-        <Source Value="fmastersite.pas"/>
-        <Line Value="52"/>
-      </Item1>
-    </BreakPoints>
-    <Exceptions Count="3">
-      <Item1>
-        <Name Value="EAbort"/>
-      </Item1>
-      <Item2>
-        <Name Value="ECodetoolError"/>
-      </Item2>
-      <Item3>
-        <Name Value="EFOpenError"/>
-      </Item3>
-    </Exceptions>
-  </Debugging>
 </CONFIG>
diff --git a/examples/dockmanager/elasticsite/MakeSite.lpr b/examples/dockmanager/elasticsite/MakeSite.lpr
index 61ea2d1d63..ef9de146f7 100644
--- a/examples/dockmanager/elasticsite/MakeSite.lpr
+++ b/examples/dockmanager/elasticsite/MakeSite.lpr
@@ -9,8 +9,6 @@ uses
   Interfaces, // this includes the LCL widgetset
   Forms, fMasterSite, fclientform, EasyDockMgr;
 
-{$IFDEF WINDOWS}{$R MakeSite.rc}{$ENDIF}
-
 begin
   Application.Initialize;
   Application.CreateForm(TMasterSite, MasterSite);