diff --git a/components/jvcllaz/examples/JvDBLookupTreeView/main.pas b/components/jvcllaz/examples/JvDBLookupTreeView/main.pas
index 6cd405d4d..6aa80e89d 100644
--- a/components/jvcllaz/examples/JvDBLookupTreeView/main.pas
+++ b/components/jvcllaz/examples/JvDBLookupTreeView/main.pas
@@ -5,9 +5,9 @@ unit main;
 interface
 
 uses
-  Classes, SysUtils, BufDataset, DB, Forms, Controls, Graphics, Dialogs,
-  DBGrids, JvDBLookup, JvDBLookupTreeView, JvDBTreeView, ExtCtrls, DBCtrls,
-  StdCtrls, Grids;
+  Classes, SysUtils, BufDataset, Forms, Controls, Graphics, Dialogs,
+  StdCtrls, ExtCtrls, Grids, DB, DBGrids, DBCtrls,
+  JvDBLookupTreeView;
 
 type
 
diff --git a/components/jvcllaz/examples/JvDesigner/jvDesignerDemo.lpi b/components/jvcllaz/examples/JvDesigner/jvDesignerDemo.lpi
index 43ed60ab0..0a3438c2b 100644
--- a/components/jvcllaz/examples/JvDesigner/jvDesignerDemo.lpi
+++ b/components/jvcllaz/examples/JvDesigner/jvDesignerDemo.lpi
@@ -51,6 +51,8 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
+        <TopLine Value="94"/>
+        <CursorPos X="3" Y="97"/>
         <UsageCount Value="43"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -231,7 +233,7 @@
         <Loaded Value="True"/>
       </Unit25>
       <Unit26>
-        <Filename Value="c:\lazarus-trunk_fpc304\lcl\forms.pp"/>
+        <Filename Value="C:\lazarus-trunk_fpc304\lcl\forms.pp"/>
         <UnitName Value="Forms"/>
         <EditorIndex Value="8"/>
         <TopLine Value="1737"/>
@@ -247,7 +249,7 @@
         <UsageCount Value="12"/>
       </Unit27>
       <Unit28>
-        <Filename Value="c:\lazarus-trunk_fpc304\lcl\include\control.inc"/>
+        <Filename Value="C:\lazarus-trunk_fpc304\lcl\include\control.inc"/>
         <EditorIndex Value="3"/>
         <TopLine Value="3305"/>
         <CursorPos Y="3324"/>
@@ -255,7 +257,7 @@
         <Loaded Value="True"/>
       </Unit28>
       <Unit29>
-        <Filename Value="c:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/>
+        <Filename Value="C:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/>
         <EditorIndex Value="4"/>
         <TopLine Value="8121"/>
         <CursorPos Y="8145"/>
@@ -263,7 +265,7 @@
         <Loaded Value="True"/>
       </Unit29>
       <Unit30>
-        <Filename Value="c:\lazarus-trunk_fpc304\lcl\lclmessageglue.pas"/>
+        <Filename Value="C:\lazarus-trunk_fpc304\lcl\lclmessageglue.pas"/>
         <UnitName Value="LCLMessageGlue"/>
         <EditorIndex Value="2"/>
         <TopLine Value="102"/>
@@ -275,123 +277,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="C:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/>
-        <Caret Line="8123" TopLine="8103"/>
+        <Caret Line="8125" TopLine="8103"/>
       </Position1>
       <Position2>
         <Filename Value="C:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/>
-        <Caret Line="8125" TopLine="8103"/>
+        <Caret Line="8127" TopLine="8103"/>
       </Position2>
       <Position3>
         <Filename Value="C:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/>
-        <Caret Line="8127" TopLine="8103"/>
+        <Caret Line="8128" TopLine="8103"/>
       </Position3>
       <Position4>
         <Filename Value="C:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/>
-        <Caret Line="8128" TopLine="8103"/>
+        <Caret Line="8130" TopLine="8103"/>
       </Position4>
       <Position5>
         <Filename Value="C:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/>
-        <Caret Line="8130" TopLine="8103"/>
+        <Caret Line="8131" TopLine="8103"/>
       </Position5>
       <Position6>
         <Filename Value="C:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/>
-        <Caret Line="8131" TopLine="8103"/>
+        <Caret Line="8139" TopLine="8121"/>
       </Position6>
       <Position7>
         <Filename Value="C:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/>
-        <Caret Line="8139" TopLine="8121"/>
+        <Caret Line="8142" TopLine="8121"/>
       </Position7>
       <Position8>
         <Filename Value="C:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/>
-        <Caret Line="8142" TopLine="8121"/>
+        <Caret Line="8145" TopLine="8121"/>
       </Position8>
       <Position9>
-        <Filename Value="C:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/>
-        <Caret Line="8145" TopLine="8121"/>
-      </Position9>
-      <Position10>
         <Filename Value="C:\lazarus-trunk_fpc304\lcl\include\control.inc"/>
         <Caret Line="3324" TopLine="3305"/>
-      </Position10>
-      <Position11>
+      </Position9>
+      <Position10>
         <Filename Value="..\..\run\JvRuntimeDesign\jvdesignimp.pas"/>
         <Caret Line="1226" TopLine="1215"/>
+      </Position10>
+      <Position11>
+        <Filename Value="..\..\run\JvRuntimeDesign\jvdesignsurface.pas"/>
+        <Caret Line="436" TopLine="418"/>
       </Position11>
       <Position12>
         <Filename Value="..\..\run\JvRuntimeDesign\jvdesignsurface.pas"/>
-        <Caret Line="436" TopLine="418"/>
+        <Caret Line="438" TopLine="418"/>
       </Position12>
       <Position13>
-        <Filename Value="..\..\run\JvRuntimeDesign\jvdesignsurface.pas"/>
-        <Caret Line="438" TopLine="418"/>
+        <Filename Value="..\..\run\JvRuntimeDesign\jvdesignimp.pas"/>
+        <Caret Line="1227" TopLine="1215"/>
       </Position13>
       <Position14>
         <Filename Value="..\..\run\JvRuntimeDesign\jvdesignimp.pas"/>
-        <Caret Line="1227" TopLine="1215"/>
+        <Caret Line="1234" TopLine="1215"/>
       </Position14>
       <Position15>
         <Filename Value="..\..\run\JvRuntimeDesign\jvdesignimp.pas"/>
-        <Caret Line="1234" TopLine="1215"/>
+        <Caret Line="994" TopLine="977"/>
       </Position15>
       <Position16>
         <Filename Value="..\..\run\JvRuntimeDesign\jvdesignimp.pas"/>
-        <Caret Line="994" TopLine="977"/>
+        <Caret Line="995" TopLine="977"/>
       </Position16>
       <Position17>
         <Filename Value="..\..\run\JvRuntimeDesign\jvdesignimp.pas"/>
-        <Caret Line="995" TopLine="977"/>
+        <Caret Line="1003" TopLine="977"/>
       </Position17>
       <Position18>
-        <Filename Value="..\..\run\JvRuntimeDesign\jvdesignimp.pas"/>
-        <Caret Line="1003" TopLine="977"/>
+        <Filename Value="..\..\run\JvRuntimeDesign\jvdesignsurface.pas"/>
+        <Caret Line="540" TopLine="522"/>
       </Position18>
       <Position19>
         <Filename Value="..\..\run\JvRuntimeDesign\jvdesignsurface.pas"/>
-        <Caret Line="540" TopLine="522"/>
+        <Caret Line="542" TopLine="522"/>
       </Position19>
       <Position20>
-        <Filename Value="..\..\run\JvRuntimeDesign\jvdesignsurface.pas"/>
-        <Caret Line="542" TopLine="522"/>
+        <Filename Value="..\..\run\JvRuntimeDesign\jvdesignimp.pas"/>
+        <Caret Line="1006" TopLine="977"/>
       </Position20>
       <Position21>
         <Filename Value="..\..\run\JvRuntimeDesign\jvdesignimp.pas"/>
-        <Caret Line="1006" TopLine="977"/>
+        <Caret Line="1008" TopLine="979"/>
       </Position21>
       <Position22>
         <Filename Value="..\..\run\JvRuntimeDesign\jvdesignimp.pas"/>
-        <Caret Line="1008" TopLine="979"/>
+        <Caret Line="1025" TopLine="1007"/>
       </Position22>
       <Position23>
         <Filename Value="..\..\run\JvRuntimeDesign\jvdesignimp.pas"/>
-        <Caret Line="1025" TopLine="1007"/>
+        <Caret Line="1026" TopLine="1007"/>
       </Position23>
       <Position24>
         <Filename Value="..\..\run\JvRuntimeDesign\jvdesignimp.pas"/>
-        <Caret Line="1026" TopLine="1007"/>
+        <Caret Line="1028" TopLine="1007"/>
       </Position24>
       <Position25>
         <Filename Value="..\..\run\JvRuntimeDesign\jvdesignimp.pas"/>
-        <Caret Line="1028" TopLine="1007"/>
+        <Caret Line="1029" TopLine="1007"/>
       </Position25>
       <Position26>
-        <Filename Value="..\..\run\JvRuntimeDesign\jvdesignimp.pas"/>
-        <Caret Line="1029" TopLine="1007"/>
+        <Filename Value="..\..\run\JvRuntimeDesign\jvdesignsurface.pas"/>
+        <Caret Line="922" TopLine="905"/>
       </Position26>
       <Position27>
         <Filename Value="..\..\run\JvRuntimeDesign\jvdesignsurface.pas"/>
-        <Caret Line="922" TopLine="905"/>
+        <Caret Line="333" TopLine="315"/>
       </Position27>
       <Position28>
         <Filename Value="..\..\run\JvRuntimeDesign\jvdesignsurface.pas"/>
-        <Caret Line="333" TopLine="315"/>
+        <Caret Line="361" TopLine="342"/>
       </Position28>
       <Position29>
-        <Filename Value="..\..\run\JvRuntimeDesign\jvdesignsurface.pas"/>
-        <Caret Line="361" TopLine="342"/>
-      </Position29>
-      <Position30>
         <Filename Value="C:\lazarus-trunk_fpc304\lcl\lclmessageglue.pas"/>
         <Caret Line="118" Column="55" TopLine="102"/>
+      </Position29>
+      <Position30>
+        <Filename Value="main.pas"/>
+        <Caret Line="44" Column="23" TopLine="38"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>
diff --git a/components/jvcllaz/examples/JvDesigner/main.lfm b/components/jvcllaz/examples/JvDesigner/main.lfm
index db0ea4028..3a291c93a 100644
--- a/components/jvcllaz/examples/JvDesigner/main.lfm
+++ b/components/jvcllaz/examples/JvDesigner/main.lfm
@@ -8,7 +8,7 @@ object MainForm: TMainForm
   ClientWidth = 476
   Menu = MainMenu1
   OnCreate = FormCreate
-  LCLVersion = '0.9.31'
+  LCLVersion = '2.1.0.0'
   object ToolBar1: TToolBar
     Left = 0
     Height = 34
diff --git a/components/jvcllaz/examples/JvDesigner/main.pas b/components/jvcllaz/examples/JvDesigner/main.pas
index 3f8e18139..dd34eded2 100644
--- a/components/jvcllaz/examples/JvDesigner/main.pas
+++ b/components/jvcllaz/examples/JvDesigner/main.pas
@@ -73,51 +73,48 @@ uses
 
 procedure TMainForm.New1Click(Sender: TObject);
 begin
-    JvDesignPanel.Clear;
+  JvDesignPanel.Clear;
 end;
 
 procedure TMainForm.Grid1Click(Sender: TObject);
 begin
-
+  //
 end;
 
 procedure TMainForm.csDesigning1Click(Sender: TObject);
 begin
-    JvDesignPanel.Active := false;
+  JvDesignPanel.Active := false;
   if WindowProcHook1.Checked then
     JvDesignPanel.Surface.MessengerClass := TJvDesignWinControlHookMessenger
   else
     JvDesignPanel.Surface.MessengerClass := TJvDesignDesignerMessenger;
   JvDesignPanel.Active := true;
   JvDesignPanel.Invalidate;
-
 end;
 
 procedure TMainForm.FormCreate(Sender: TObject);
 begin
-     OpenDialog.InitialDir := ExtractFilePath(Application.ExeName);
+//  OpenDialog.InitialDir := ExtractFilePath(Application.ExeName);
+  OpenDialog.InitialDir := '../../../examples/JvDesigner/';
   SaveDialog.InitialDir := OpenDialog.InitialDir;
   JvDesignPanel.Surface.Active := true;
-
 end;
 
 procedure TMainForm.Active1Click(Sender: TObject);
 begin
-    JvDesignPanel.Active := Active1.Checked;
+  JvDesignPanel.Active := Active1.Checked;
   JvDesignPanel.Invalidate;
-
 end;
 
 procedure TMainForm.Open1Click(Sender: TObject);
 begin
-    if OpenDialog.Execute then
+  if OpenDialog.Execute then
     JvDesignPanel.LoadFromFile(OpenDialog.Filename);
-
 end;
 
 procedure TMainForm.Rules1Click(Sender: TObject);
 begin
-    if Rules1.Checked then
+  if Rules1.Checked then
   begin
     JvDesignPanel.Color := clWhite;
     JvDesignPanel.DrawRules := true;
@@ -129,14 +126,12 @@ begin
     JvDesignPanel.OnPaint := @JvDesignPanelPaint;
   end;
   JvDesignPanel.Invalidate;
-
 end;
 
 procedure TMainForm.Save1Click(Sender: TObject);
 begin
-    if SaveDialog.Execute then
+  if SaveDialog.Execute then
     JvDesignPanel.SaveToFile(SaveDialog.Filename);
-
 end;
 
 procedure TMainForm.JvDesignPanelGetAddClass(Sender: TObject;
@@ -148,26 +143,22 @@ begin
       DesignClass := '';
     SelectButton.Down  := true;
   end;
-
 end;
 
 procedure TMainForm.JvDesignPanelPaint(Sender: TObject);
 begin
   with JvDesignPanel do
-     DesignPaintGrid(Canvas, ClientRect, Color);
-
+    DesignPaintGrid(Canvas, ClientRect, Color);
 end;
 
 procedure TMainForm.PaletteButtonClick(Sender: TObject);
 const
   cClasses: array[0..4] of string = ( '', 'TButton', 'TLabel', 'TPanel',
     'TImage' );
-
 begin
 // StickyClass := (GetKeyState(VK_SHIFT) < 0);
-    StickyClass := False;
+   StickyClass := False;
    DesignClass := cClasses[TControl(Sender).Tag];
-
 end;
 
 initialization