diff --git a/components/tvplanit/examples/datastores/bufdataset/project1.lpi b/components/tvplanit/examples/datastores/bufdataset/project1.lpi
index 02ba4eb27..559083187 100644
--- a/components/tvplanit/examples/datastores/bufdataset/project1.lpi
+++ b/components/tvplanit/examples/datastores/bufdataset/project1.lpi
@@ -58,6 +58,9 @@
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/tvplanit/examples/datastores/bufdataset/unit1.lfm b/components/tvplanit/examples/datastores/bufdataset/unit1.lfm
index 89a395327..47daa2070 100644
--- a/components/tvplanit/examples/datastores/bufdataset/unit1.lfm
+++ b/components/tvplanit/examples/datastores/bufdataset/unit1.lfm
@@ -7,7 +7,7 @@ object Form1: TForm1
   ClientHeight = 686
   ClientWidth = 980
   OnCreate = FormCreate
-  LCLVersion = '1.9.0.0'
+  LCLVersion = '2.3.0.0'
   object Panel1: TPanel
     Left = 0
     Height = 34
@@ -99,6 +99,7 @@ object Form1: TForm1
         AllDayEventAttributes.EventBorderColor = cl3DDkShadow
         AllDayEventAttributes.EventBackgroundColor = clBtnFace
         AllDayEventAttributes.Font.Height = -12
+        AllowDragAndDrop = True
         ShowEventTimes = False
         DrawingStyle = dsFlat
         TimeSlotColors.Active = clWhite
@@ -176,7 +177,6 @@ object Form1: TForm1
           Align = alBottom
           TabStop = True
           TabOrder = 1
-          KBNavigation = True
           DateLabelFormat = 'mmmm yyyy'
           DayHeadAttributes.Font.Height = -13
           DayHeadAttributes.Font.Name = 'Tahoma'
@@ -187,6 +187,7 @@ object Form1: TForm1
           EventDayStyle = []
           EventFont.Height = -12
           HeadAttributes.Color = clBtnFace
+          KBNavigation = True
           OffDayColor = clSilver
           SelectedDayColor = clRed
           ShowEvents = True
@@ -287,20 +288,16 @@ object Form1: TForm1
   end
   object VpControlLink1: TVpControlLink
     DataStore = VpBufDSDataStore1
-    Printer.BottomMargin = 0
     Printer.DayStart = h_08
     Printer.DayEnd = h_05
     Printer.Granularity = gr30Min
-    Printer.LeftMargin = 0
     Printer.MarginUnits = imAbsolutePixel
     Printer.PrintFormats = <>
-    Printer.RightMargin = 0
-    Printer.TopMargin = 0
-    left = 136
-    top = 264
+    Left = 136
+    Top = 264
   end
   object VpResourceEditDialog1: TVpResourceEditDialog
-    Version = 'v1.05'
+    Version = 'v1.12'
     DataStore = VpBufDSDataStore1
     Options = []
     Placement.Position = mpCenter
@@ -308,8 +305,8 @@ object Form1: TForm1
     Placement.Left = 10
     Placement.Height = 250
     Placement.Width = 400
-    left = 136
-    top = 335
+    Left = 136
+    Top = 335
   end
   object VpBufDSDataStore1: TVpBufDSDataStore
     CategoryColorMap.Category0.Color = clNavy
@@ -340,7 +337,7 @@ object Form1: TForm1
     AutoCreate = True
     DayBuffer = 31
     UseAutoIncFields = False
-    left = 136
-    top = 192
+    Left = 136
+    Top = 192
   end
 end
diff --git a/components/tvplanit/examples/datastores/fb/project1.lpi b/components/tvplanit/examples/datastores/fb/project1.lpi
index ff44bf1d3..277f0b935 100644
--- a/components/tvplanit/examples/datastores/fb/project1.lpi
+++ b/components/tvplanit/examples/datastores/fb/project1.lpi
@@ -69,6 +69,9 @@
       </Checks>
     </CodeGeneration>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/tvplanit/examples/datastores/fb/unit1.lfm b/components/tvplanit/examples/datastores/fb/unit1.lfm
index 6e99fd95a..235ec56dd 100644
--- a/components/tvplanit/examples/datastores/fb/unit1.lfm
+++ b/components/tvplanit/examples/datastores/fb/unit1.lfm
@@ -8,7 +8,7 @@ object Form1: TForm1
   ClientWidth = 895
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  LCLVersion = '2.1.0.0'
+  LCLVersion = '2.3.0.0'
   object Panel1: TPanel
     Left = 0
     Height = 33
@@ -91,6 +91,7 @@ object Form1: TForm1
         AllDayEventAttributes.BackgroundColor = clBtnShadow
         AllDayEventAttributes.EventBorderColor = cl3DDkShadow
         AllDayEventAttributes.EventBackgroundColor = clBtnFace
+        AllowDragAndDrop = True
         ShowEventTimes = False
         DrawingStyle = dsFlat
         TimeSlotColors.Active = clWhite
@@ -233,11 +234,11 @@ object Form1: TForm1
     end
     object TabSheet2: TTabSheet
       Caption = 'Contacts'
-      ClientHeight = 594
-      ClientWidth = 928
+      ClientHeight = 625
+      ClientWidth = 887
       object VpContactButtonBar1: TVpContactButtonBar
         Left = 0
-        Height = 594
+        Height = 625
         Top = 0
         Width = 40
         DrawingStyle = dsFlat
@@ -246,9 +247,9 @@ object Form1: TForm1
       end
       object VpContactGrid1: TVpContactGrid
         Left = 40
-        Height = 594
+        Height = 625
         Top = 0
-        Width = 888
+        Width = 847
         DataStore = VpFirebirdDatastore1
         ControlLink = VpControlLink1
         Color = clWindow
@@ -267,17 +268,13 @@ object Form1: TForm1
   end
   object VpControlLink1: TVpControlLink
     DataStore = VpFirebirdDatastore1
-    Printer.BottomMargin = 0
     Printer.DayStart = h_08
     Printer.DayEnd = h_05
     Printer.Granularity = gr30Min
-    Printer.LeftMargin = 0
     Printer.MarginUnits = imAbsolutePixel
     Printer.PrintFormats = <>
-    Printer.RightMargin = 0
-    Printer.TopMargin = 0
-    left = 136
-    top = 264
+    Left = 136
+    Top = 264
   end
   object VpResourceEditDialog1: TVpResourceEditDialog
     Version = 'v1.12'
@@ -288,15 +285,15 @@ object Form1: TForm1
     Placement.Left = 10
     Placement.Height = 250
     Placement.Width = 400
-    left = 136
-    top = 335
+    Left = 136
+    Top = 335
   end
   object SQLTransaction1: TSQLTransaction
     Active = False
     Action = caCommitRetaining
     Database = IBConnection1
-    left = 256
-    top = 120
+    Left = 256
+    Top = 120
   end
   object VpFirebirdDatastore1: TVpFirebirdDatastore
     CategoryColorMap.Category0.Color = clNavy
@@ -327,8 +324,8 @@ object Form1: TForm1
     AutoConnect = False
     AutoCreate = False
     DayBuffer = 31
-    left = 136
-    top = 200
+    Left = 136
+    Top = 200
   end
   object IBConnection1: TIBConnection
     Connected = False
@@ -336,13 +333,15 @@ object Form1: TForm1
     KeepConnection = False
     Transaction = SQLTransaction1
     CheckTransactionParams = False
-    left = 136
-    top = 120
+    UseConnectionCharSetIfNone = False
+    Left = 136
+    Top = 120
   end
   object SQLQuery1: TSQLQuery
     FieldDefs = <>
     Params = <>
-    left = 149
-    top = 512
+    Macros = <>
+    Left = 149
+    Top = 512
   end
 end
diff --git a/components/tvplanit/examples/datastores/flex/access/project1.lpi b/components/tvplanit/examples/datastores/flex/access/project1.lpi
index 0f7ac67d9..393310205 100644
--- a/components/tvplanit/examples/datastores/flex/access/project1.lpi
+++ b/components/tvplanit/examples/datastores/flex/access/project1.lpi
@@ -64,6 +64,9 @@
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/tvplanit/examples/datastores/flex/access/unit1.lfm b/components/tvplanit/examples/datastores/flex/access/unit1.lfm
index 5c30f01de..822264de8 100644
--- a/components/tvplanit/examples/datastores/flex/access/unit1.lfm
+++ b/components/tvplanit/examples/datastores/flex/access/unit1.lfm
@@ -8,7 +8,7 @@ object Form1: TForm1
   ClientWidth = 980
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  LCLVersion = '1.9.0.0'
+  LCLVersion = '2.3.0.0'
   object Panel1: TPanel
     Left = 0
     Height = 33
@@ -68,9 +68,9 @@ object Form1: TForm1
     Height = 653
     Top = 33
     Width = 980
-    ActivePage = TabSheet3
+    ActivePage = TabSheet1
     Align = alClient
-    TabIndex = 2
+    TabIndex = 0
     TabOrder = 1
     OnChange = PageControl1Change
     object TabSheet1: TTabSheet
@@ -92,6 +92,7 @@ object Form1: TForm1
         AllDayEventAttributes.BackgroundColor = clBtnShadow
         AllDayEventAttributes.EventBorderColor = cl3DDkShadow
         AllDayEventAttributes.EventBackgroundColor = clBtnFace
+        AllowDragAndDrop = True
         ShowEventTimes = False
         DrawingStyle = dsFlat
         TimeSlotColors.Active = clWhite
@@ -234,11 +235,11 @@ object Form1: TForm1
     end
     object TabSheet2: TTabSheet
       Caption = 'Contacts'
-      ClientHeight = 624
+      ClientHeight = 625
       ClientWidth = 972
       object VpContactButtonBar1: TVpContactButtonBar
         Left = 0
-        Height = 624
+        Height = 625
         Top = 0
         Width = 40
         DrawingStyle = dsFlat
@@ -247,7 +248,7 @@ object Form1: TForm1
       end
       object VpContactGrid1: TVpContactGrid
         Left = 40
-        Height = 624
+        Height = 625
         Top = 0
         Width = 932
         DataStore = VpFlexDataStore1
@@ -344,17 +345,13 @@ object Form1: TForm1
   end
   object VpControlLink1: TVpControlLink
     DataStore = VpFlexDataStore1
-    Printer.BottomMargin = 0
     Printer.DayStart = h_08
     Printer.DayEnd = h_05
     Printer.Granularity = gr30Min
-    Printer.LeftMargin = 0
     Printer.MarginUnits = imAbsolutePixel
     Printer.PrintFormats = <>
-    Printer.RightMargin = 0
-    Printer.TopMargin = 0
-    left = 136
-    top = 168
+    Left = 136
+    Top = 168
   end
   object VpResourceEditDialog1: TVpResourceEditDialog
     Version = 'v1.12'
@@ -365,8 +362,8 @@ object Form1: TForm1
     Placement.Left = 10
     Placement.Height = 250
     Placement.Width = 400
-    left = 136
-    top = 232
+    Left = 136
+    Top = 232
   end
   object VpFlexDataStore1: TVpFlexDataStore
     CategoryColorMap.Category0.Color = clNavy
@@ -402,8 +399,8 @@ object Form1: TForm1
     DataSources.TasksDataSource = DsTasks
     ResourceID = 0
     OnCreateTable = VpFlexDataStore1CreateTable
-    left = 136
-    top = 101
+    Left = 136
+    Top = 101
     ResourceFieldMappings = (
       'ResourceID'
       'ResourceID'
@@ -591,23 +588,23 @@ object Form1: TForm1
   end
   object DsResources: TDataSource
     DataSet = QryResources
-    left = 240
-    top = 428
+    Left = 240
+    Top = 428
   end
   object DsContacts: TDataSource
     DataSet = QryContacts
-    left = 240
-    top = 496
+    Left = 240
+    Top = 496
   end
   object DsEvents: TDataSource
     DataSet = QryEvents
-    left = 240
-    top = 560
+    Left = 240
+    Top = 560
   end
   object DsTasks: TDataSource
     DataSet = QryTasks
-    left = 240
-    top = 621
+    Left = 240
+    Top = 621
   end
   object QryResources: TSQLQuery
     PacketRecords = -1
@@ -722,9 +719,10 @@ object Form1: TForm1
     )
     Options = [sqoKeepOpenOnCommit, sqoAutoApplyUpdates, sqoAutoCommit]
     Params = <>
+    Macros = <>
     UsePrimaryKeyAsKey = False
-    left = 136
-    top = 428
+    Left = 136
+    Top = 428
   end
   object QryContacts: TSQLQuery
     PacketRecords = -1
@@ -1065,9 +1063,10 @@ object Form1: TForm1
     )
     Options = [sqoKeepOpenOnCommit, sqoAutoApplyUpdates, sqoAutoCommit]
     Params = <>
+    Macros = <>
     UsePrimaryKeyAsKey = False
-    left = 136
-    top = 496
+    Left = 136
+    Top = 496
   end
   object QryEvents: TSQLQuery
     PacketRecords = -1
@@ -1196,9 +1195,10 @@ object Form1: TForm1
     )
     Options = [sqoKeepOpenOnCommit, sqoAutoApplyUpdates, sqoAutoCommit]
     Params = <>
+    Macros = <>
     UsePrimaryKeyAsKey = False
-    left = 136
-    top = 560
+    Left = 136
+    Top = 560
   end
   object QryTasks: TSQLQuery
     PacketRecords = -1
@@ -1283,9 +1283,10 @@ object Form1: TForm1
     )
     Options = [sqoKeepOpenOnCommit, sqoAutoApplyUpdates, sqoAutoCommit]
     Params = <>
+    Macros = <>
     UsePrimaryKeyAsKey = False
-    left = 136
-    top = 621
+    Left = 136
+    Top = 621
   end
   object ODBCConnection1: TODBCConnection
     Connected = False
@@ -1296,15 +1297,15 @@ object Form1: TForm1
     )
     Transaction = SQLTransaction1
     Driver = 'Microsoft Access Driver (*.mdb)'
-    left = 136
-    top = 304
+    Left = 136
+    Top = 304
   end
   object SQLTransaction1: TSQLTransaction
     Active = False
     Action = caCommitRetaining
     Database = ODBCConnection1
-    left = 136
-    top = 368
+    Left = 136
+    Top = 368
   end
   object QryAllResources: TSQLQuery
     PacketRecords = -1
@@ -1407,10 +1408,11 @@ object Form1: TForm1
     )
     Options = [sqoKeepOpenOnCommit, sqoAutoCommit]
     Params = <>
+    Macros = <>
     UpdateMode = upWhereAll
     UsePrimaryKeyAsKey = False
-    left = 531
-    top = 171
+    Left = 531
+    Top = 171
   end
   object QryAllContacts: TSQLQuery
     PacketRecords = -1
@@ -1602,10 +1604,11 @@ object Form1: TForm1
     )
     Options = [sqoKeepOpenOnCommit, sqoAutoCommit]
     Params = <>
+    Macros = <>
     UpdateMode = upWhereAll
     UsePrimaryKeyAsKey = False
-    left = 531
-    top = 225
+    Left = 531
+    Top = 225
   end
   object QryAllEvents: TSQLQuery
     PacketRecords = -1
@@ -1620,10 +1623,11 @@ object Form1: TForm1
     )
     Options = [sqoKeepOpenOnCommit, sqoAutoCommit]
     Params = <>
+    Macros = <>
     UpdateMode = upWhereAll
     UsePrimaryKeyAsKey = False
-    left = 531
-    top = 285
+    Left = 531
+    Top = 285
   end
   object QryAllTasks: TSQLQuery
     PacketRecords = -1
@@ -1638,29 +1642,30 @@ object Form1: TForm1
     )
     Options = [sqoKeepOpenOnCommit, sqoAutoCommit]
     Params = <>
+    Macros = <>
     UpdateMode = upWhereAll
     UsePrimaryKeyAsKey = False
-    left = 531
-    top = 352
+    Left = 531
+    Top = 352
   end
   object DsAllResources: TDataSource
     DataSet = QryAllResources
-    left = 627
-    top = 171
+    Left = 627
+    Top = 171
   end
   object DsAllContacts: TDataSource
     DataSet = QryAllContacts
-    left = 630
-    top = 225
+    Left = 630
+    Top = 225
   end
   object DsAllEvents: TDataSource
     DataSet = QryAllEvents
-    left = 625
-    top = 285
+    Left = 625
+    Top = 285
   end
   object DsAllTasks: TDataSource
     DataSet = QryAllTasks
-    left = 627
-    top = 352
+    Left = 627
+    Top = 352
   end
 end
diff --git a/components/tvplanit/examples/datastores/flex/sqlite3/project1.lpi b/components/tvplanit/examples/datastores/flex/sqlite3/project1.lpi
index 9b9db5117..090d9ec24 100644
--- a/components/tvplanit/examples/datastores/flex/sqlite3/project1.lpi
+++ b/components/tvplanit/examples/datastores/flex/sqlite3/project1.lpi
@@ -65,6 +65,9 @@
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/tvplanit/examples/datastores/flex/sqlite3/unit1.lfm b/components/tvplanit/examples/datastores/flex/sqlite3/unit1.lfm
index da46c9a4d..1535f5cc5 100644
--- a/components/tvplanit/examples/datastores/flex/sqlite3/unit1.lfm
+++ b/components/tvplanit/examples/datastores/flex/sqlite3/unit1.lfm
@@ -1,14 +1,14 @@
 object Form1: TForm1
-  Left = 344
+  Left = 497
   Height = 686
-  Top = 169
+  Top = 161
   Width = 910
   Caption = 'Form1'
   ClientHeight = 686
   ClientWidth = 910
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  LCLVersion = '1.6.4.0'
+  LCLVersion = '2.3.0.0'
   object Panel1: TPanel
     Left = 0
     Height = 33
@@ -91,6 +91,7 @@ object Form1: TForm1
         AllDayEventAttributes.BackgroundColor = clBtnShadow
         AllDayEventAttributes.EventBorderColor = cl3DDkShadow
         AllDayEventAttributes.EventBackgroundColor = clBtnFace
+        AllowDragAndDrop = True
         ShowEventTimes = False
         DrawingStyle = dsFlat
         TimeSlotColors.Active = clWhite
@@ -161,7 +162,6 @@ object Form1: TForm1
           Align = alBottom
           TabStop = True
           TabOrder = 1
-          KBNavigation = True
           DateLabelFormat = 'mmmm yyyy'
           DayHeadAttributes.Font.Height = -13
           DayHeadAttributes.Font.Name = 'Tahoma'
@@ -170,6 +170,7 @@ object Form1: TForm1
           DrawingStyle = dsFlat
           EventDayStyle = []
           HeadAttributes.Color = clBtnFace
+          KBNavigation = True
           OffDayColor = clSilver
           SelectedDayColor = clRed
           ShowEvents = True
@@ -233,11 +234,11 @@ object Form1: TForm1
     end
     object TabSheet2: TTabSheet
       Caption = 'Contacts'
-      ClientHeight = 624
-      ClientWidth = 972
+      ClientHeight = 625
+      ClientWidth = 902
       object VpContactButtonBar1: TVpContactButtonBar
         Left = 0
-        Height = 624
+        Height = 625
         Top = 0
         Width = 40
         DrawingStyle = dsFlat
@@ -246,9 +247,9 @@ object Form1: TForm1
       end
       object VpContactGrid1: TVpContactGrid
         Left = 40
-        Height = 624
+        Height = 625
         Top = 0
-        Width = 932
+        Width = 862
         DataStore = VpFlexDataStore1
         ControlLink = VpControlLink1
         Color = clWindow
@@ -267,20 +268,16 @@ object Form1: TForm1
   end
   object VpControlLink1: TVpControlLink
     DataStore = VpFlexDataStore1
-    Printer.BottomMargin = 0
     Printer.DayStart = h_08
     Printer.DayEnd = h_05
     Printer.Granularity = gr30Min
-    Printer.LeftMargin = 0
     Printer.MarginUnits = imAbsolutePixel
     Printer.PrintFormats = <>
-    Printer.RightMargin = 0
-    Printer.TopMargin = 0
-    left = 136
-    top = 168
+    Left = 136
+    Top = 168
   end
   object VpResourceEditDialog1: TVpResourceEditDialog
-    Version = 'v1.05'
+    Version = 'v1.12'
     DataStore = VpFlexDataStore1
     Options = []
     Placement.Position = mpCenter
@@ -288,8 +285,8 @@ object Form1: TForm1
     Placement.Left = 10
     Placement.Height = 250
     Placement.Width = 400
-    left = 136
-    top = 232
+    Left = 136
+    Top = 232
   end
   object VpFlexDataStore1: TVpFlexDataStore
     CategoryColorMap.Category0.Color = clNavy
@@ -324,8 +321,8 @@ object Form1: TForm1
     DataSources.ContactsDataSource = DsContacts
     DataSources.TasksDataSource = DsTasks
     ResourceID = 0
-    left = 136
-    top = 101
+    Left = 136
+    Top = 101
     ResourceFieldMappings = (
       'ResourceID'
       'ResourceID'
@@ -517,23 +514,23 @@ object Form1: TForm1
   end
   object DsResources: TDataSource
     DataSet = QryResources
-    left = 240
-    top = 428
+    Left = 240
+    Top = 428
   end
   object DsContacts: TDataSource
     DataSet = QryContacts
-    left = 240
-    top = 496
+    Left = 240
+    Top = 496
   end
   object DsEvents: TDataSource
     DataSet = QryEvents
-    left = 240
-    top = 560
+    Left = 240
+    Top = 560
   end
   object DsTasks: TDataSource
     DataSet = QryTasks
-    left = 240
-    top = 621
+    Left = 240
+    Top = 621
   end
   object QryResources: TSQLQuery
     PacketRecords = -1
@@ -577,8 +574,9 @@ object Form1: TForm1
       ''
     )
     Params = <>
-    left = 136
-    top = 428
+    Macros = <>
+    Left = 136
+    Top = 428
   end
   object QryContacts: TSQLQuery
     PacketRecords = -1
@@ -771,8 +769,9 @@ object Form1: TForm1
       ''
     )
     Params = <>
-    left = 136
-    top = 496
+    Macros = <>
+    Left = 136
+    Top = 496
   end
   object QryEvents: TSQLQuery
     PacketRecords = -1
@@ -878,8 +877,9 @@ object Form1: TForm1
       ''
     )
     Params = <>
-    left = 136
-    top = 560
+    Macros = <>
+    Left = 136
+    Top = 560
   end
   object QryTasks: TSQLQuery
     PacketRecords = -1
@@ -948,23 +948,24 @@ object Form1: TForm1
       ''
     )
     Params = <>
-    left = 136
-    top = 621
+    Macros = <>
+    Left = 136
+    Top = 621
   end
   object SQLTransaction1: TSQLTransaction
     Active = False
+    Action = caCommitRetaining
     Database = SQLite3Connection1
-    Options = []
-    left = 136
-    top = 368
+    Left = 136
+    Top = 368
   end
   object SQLite3Connection1: TSQLite3Connection
     Connected = False
     LoginPrompt = False
     KeepConnection = False
     Transaction = SQLTransaction1
-    Options = []
-    left = 136
-    top = 312
+    AlwaysUseBigint = False
+    Left = 136
+    Top = 312
   end
 end
diff --git a/components/tvplanit/examples/datastores/flex/sqlite3/unit1.pas b/components/tvplanit/examples/datastores/flex/sqlite3/unit1.pas
index af079af7f..a6b0c28b7 100644
--- a/components/tvplanit/examples/datastores/flex/sqlite3/unit1.pas
+++ b/components/tvplanit/examples/datastores/flex/sqlite3/unit1.pas
@@ -103,7 +103,7 @@ end;
 procedure TForm1.CreateDB(AFileName: String);
 begin
   SQLite3Connection1.Close; // Ensure the connection is closed when we start
-
+   
   // Create the database and the tables
   try
     SQLite3Connection1.DatabaseName := AFileName;
@@ -285,7 +285,13 @@ begin
 
     // Transaction
     SQLTransaction1.DataBase := Sqlite3Connection1;
+    SQLTransaction1.Action := caCommitRetaining;
 
+    QryResources.Options := QryResources.Options + [sqoAutoApplyUpdates];
+    QryEvents.Options := QryEvents.Options + [sqoAutoApplyUpdates];
+    QryTasks.Options := QryTasks.Options + [sqoAutoApplyUpdates];
+    QryContacts.Options := QryContacts.Options + [sqoAutoApplyUpdates];
+    
     if not FileExists(AppendPathDelim(Application.Location) + DB_NAME) then
       CreateDB(AppendPathDelim(Application.Location) + DB_NAME);
 
diff --git a/components/tvplanit/examples/datastores/ini/project1.lpi b/components/tvplanit/examples/datastores/ini/project1.lpi
index 31e45ec8a..ce17bcb87 100644
--- a/components/tvplanit/examples/datastores/ini/project1.lpi
+++ b/components/tvplanit/examples/datastores/ini/project1.lpi
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="11"/>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="project1"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
@@ -57,6 +59,7 @@
     </SearchPaths>
     <Linking>
       <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
         <UseExternalDbgSyms Value="True"/>
       </Debugging>
       <Options>
diff --git a/components/tvplanit/examples/datastores/ini/unit1.lfm b/components/tvplanit/examples/datastores/ini/unit1.lfm
index 9450746c7..417c4af97 100644
--- a/components/tvplanit/examples/datastores/ini/unit1.lfm
+++ b/components/tvplanit/examples/datastores/ini/unit1.lfm
@@ -7,7 +7,7 @@ object Form1: TForm1
   ClientHeight = 686
   ClientWidth = 980
   OnCreate = FormCreate
-  LCLVersion = '1.6.4.0'
+  LCLVersion = '2.3.0.0'
   object Panel1: TPanel
     Left = 0
     Height = 33
@@ -90,6 +90,7 @@ object Form1: TForm1
         AllDayEventAttributes.BackgroundColor = clBtnShadow
         AllDayEventAttributes.EventBorderColor = cl3DDkShadow
         AllDayEventAttributes.EventBackgroundColor = clBtnFace
+        AllowDragAndDrop = True
         ShowEventTimes = False
         DrawingStyle = dsFlat
         TimeSlotColors.Active = clWhite
@@ -160,7 +161,6 @@ object Form1: TForm1
           Align = alBottom
           TabStop = True
           TabOrder = 1
-          KBNavigation = True
           DateLabelFormat = 'mmmm yyyy'
           DayHeadAttributes.Font.Height = -13
           DayHeadAttributes.Font.Name = 'Tahoma'
@@ -169,6 +169,7 @@ object Form1: TForm1
           DrawingStyle = dsFlat
           EventDayStyle = []
           HeadAttributes.Color = clBtnFace
+          KBNavigation = True
           OffDayColor = clSilver
           SelectedDayColor = clRed
           ShowEvents = True
@@ -232,11 +233,11 @@ object Form1: TForm1
     end
     object TabSheet2: TTabSheet
       Caption = 'Contacts'
-      ClientHeight = 594
-      ClientWidth = 928
+      ClientHeight = 625
+      ClientWidth = 972
       object VpContactButtonBar1: TVpContactButtonBar
         Left = 0
-        Height = 594
+        Height = 625
         Top = 0
         Width = 40
         DrawingStyle = dsFlat
@@ -245,9 +246,9 @@ object Form1: TForm1
       end
       object VpContactGrid1: TVpContactGrid
         Left = 40
-        Height = 594
+        Height = 625
         Top = 0
-        Width = 888
+        Width = 932
         DataStore = VpIniDatastore1
         ControlLink = VpControlLink1
         Color = clWindow
@@ -266,20 +267,16 @@ object Form1: TForm1
   end
   object VpControlLink1: TVpControlLink
     DataStore = VpIniDatastore1
-    Printer.BottomMargin = 0
     Printer.DayStart = h_08
     Printer.DayEnd = h_05
     Printer.Granularity = gr30Min
-    Printer.LeftMargin = 0
     Printer.MarginUnits = imAbsolutePixel
     Printer.PrintFormats = <>
-    Printer.RightMargin = 0
-    Printer.TopMargin = 0
-    left = 136
-    top = 264
+    Left = 136
+    Top = 264
   end
   object VpResourceEditDialog1: TVpResourceEditDialog
-    Version = 'v1.05'
+    Version = 'v1.12'
     DataStore = VpIniDatastore1
     Options = []
     Placement.Position = mpCenter
@@ -287,8 +284,8 @@ object Form1: TForm1
     Placement.Left = 10
     Placement.Height = 250
     Placement.Width = 400
-    left = 136
-    top = 335
+    Left = 136
+    Top = 335
   end
   object VpIniDatastore1: TVpIniDatastore
     CategoryColorMap.Category0.Color = clNavy
@@ -317,11 +314,11 @@ object Form1: TForm1
     PlayEventSounds = True
     AutoConnect = True
     FileName = 'data.ini'
-    left = 136
-    top = 200
+    Left = 136
+    Top = 200
   end
   object PopupMenu1: TPopupMenu
-    left = 129
-    top = 527
+    Left = 129
+    Top = 527
   end
 end
diff --git a/components/tvplanit/examples/datastores/json/project1.lpi b/components/tvplanit/examples/datastores/json/project1.lpi
index 31e45ec8a..ce17bcb87 100644
--- a/components/tvplanit/examples/datastores/json/project1.lpi
+++ b/components/tvplanit/examples/datastores/json/project1.lpi
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="11"/>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="project1"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
@@ -57,6 +59,7 @@
     </SearchPaths>
     <Linking>
       <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
         <UseExternalDbgSyms Value="True"/>
       </Debugging>
       <Options>
diff --git a/components/tvplanit/examples/datastores/json/unit1.lfm b/components/tvplanit/examples/datastores/json/unit1.lfm
index f0b3d0b11..f4c6c0f1c 100644
--- a/components/tvplanit/examples/datastores/json/unit1.lfm
+++ b/components/tvplanit/examples/datastores/json/unit1.lfm
@@ -7,7 +7,7 @@ object Form1: TForm1
   ClientHeight = 686
   ClientWidth = 980
   OnCreate = FormCreate
-  LCLVersion = '2.1.0.0'
+  LCLVersion = '2.3.0.0'
   object Panel1: TPanel
     Left = 0
     Height = 33
@@ -93,6 +93,7 @@ object Form1: TForm1
         AllDayEventAttributes.EventBorderColor = cl3DDkShadow
         AllDayEventAttributes.EventBackgroundColor = clBtnFace
         AllDayEventAttributes.Font.Height = -12
+        AllowDragAndDrop = True
         ShowEventTimes = False
         DrawingStyle = dsFlat
         TimeSlotColors.Active = clWhite
@@ -245,11 +246,11 @@ object Form1: TForm1
     end
     object TabSheet2: TTabSheet
       Caption = 'Contacts'
-      ClientHeight = 624
+      ClientHeight = 625
       ClientWidth = 972
       object VpContactButtonBar1: TVpContactButtonBar
         Left = 0
-        Height = 624
+        Height = 625
         Top = 0
         Width = 40
         DrawingStyle = dsFlat
@@ -258,7 +259,7 @@ object Form1: TForm1
       end
       object VpContactGrid1: TVpContactGrid
         Left = 40
-        Height = 624
+        Height = 625
         Top = 0
         Width = 932
         DataStore = VpJSONDataStore1
@@ -282,17 +283,13 @@ object Form1: TForm1
   end
   object VpControlLink1: TVpControlLink
     DataStore = VpJSONDataStore1
-    Printer.BottomMargin = 0
     Printer.DayStart = h_08
     Printer.DayEnd = h_05
     Printer.Granularity = gr30Min
-    Printer.LeftMargin = 0
     Printer.MarginUnits = imAbsolutePixel
     Printer.PrintFormats = <>
-    Printer.RightMargin = 0
-    Printer.TopMargin = 0
-    left = 136
-    top = 264
+    Left = 136
+    Top = 264
   end
   object VpResourceEditDialog1: TVpResourceEditDialog
     Version = 'v1.12'
@@ -303,12 +300,12 @@ object Form1: TForm1
     Placement.Left = 10
     Placement.Height = 250
     Placement.Width = 400
-    left = 136
-    top = 335
+    Left = 136
+    Top = 335
   end
   object PopupMenu1: TPopupMenu
-    left = 129
-    top = 527
+    Left = 129
+    Top = 527
   end
   object VpJSONDataStore1: TVpJSONDataStore
     CategoryColorMap.Category0.Color = clNavy
@@ -337,7 +334,7 @@ object Form1: TForm1
     PlayEventSounds = True
     OnDisconnect = VpJSONDataStore1Disconnect
     FileName = 'data.json'
-    left = 136
-    top = 192
+    Left = 136
+    Top = 192
   end
 end
diff --git a/components/tvplanit/examples/datastores/xml/project1.lpi b/components/tvplanit/examples/datastores/xml/project1.lpi
index 02ba4eb27..559083187 100644
--- a/components/tvplanit/examples/datastores/xml/project1.lpi
+++ b/components/tvplanit/examples/datastores/xml/project1.lpi
@@ -58,6 +58,9 @@
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/tvplanit/examples/datastores/xml/unit1.lfm b/components/tvplanit/examples/datastores/xml/unit1.lfm
index 2335dac13..56ddb62a5 100644
--- a/components/tvplanit/examples/datastores/xml/unit1.lfm
+++ b/components/tvplanit/examples/datastores/xml/unit1.lfm
@@ -7,7 +7,7 @@ object Form1: TForm1
   ClientHeight = 686
   ClientWidth = 980
   OnCreate = FormCreate
-  LCLVersion = '2.0.0.3'
+  LCLVersion = '2.3.0.0'
   object Panel1: TPanel
     Left = 0
     Height = 33
@@ -93,6 +93,7 @@ object Form1: TForm1
         AllDayEventAttributes.EventBorderColor = cl3DDkShadow
         AllDayEventAttributes.EventBackgroundColor = clBtnFace
         AllDayEventAttributes.Font.Height = -12
+        AllowDragAndDrop = True
         ShowEventTimes = False
         DrawingStyle = dsFlat
         TimeSlotColors.Active = clWhite
diff --git a/components/tvplanit/examples/datastores/zeos/project1.lpi b/components/tvplanit/examples/datastores/zeos/project1.lpi
index 9509f118f..2e439348c 100644
--- a/components/tvplanit/examples/datastores/zeos/project1.lpi
+++ b/components/tvplanit/examples/datastores/zeos/project1.lpi
@@ -68,6 +68,9 @@
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/tvplanit/examples/datastores/zeos/unit1.lfm b/components/tvplanit/examples/datastores/zeos/unit1.lfm
index 434be2c07..d997cdd39 100644
--- a/components/tvplanit/examples/datastores/zeos/unit1.lfm
+++ b/components/tvplanit/examples/datastores/zeos/unit1.lfm
@@ -7,7 +7,7 @@ object Form1: TForm1
   ClientHeight = 686
   ClientWidth = 980
   OnCreate = FormCreate
-  LCLVersion = '1.9.0.0'
+  LCLVersion = '2.3.0.0'
   object Panel1: TPanel
     Left = 0
     Height = 33
@@ -90,6 +90,7 @@ object Form1: TForm1
         AllDayEventAttributes.BackgroundColor = clBtnShadow
         AllDayEventAttributes.EventBorderColor = cl3DDkShadow
         AllDayEventAttributes.EventBackgroundColor = clBtnFace
+        AllowDragAndDrop = True
         ShowEventTimes = False
         DrawingStyle = dsFlat
         TimeSlotColors.Active = clWhite
@@ -232,11 +233,11 @@ object Form1: TForm1
     end
     object TabSheet2: TTabSheet
       Caption = 'Contacts'
-      ClientHeight = 594
-      ClientWidth = 928
+      ClientHeight = 625
+      ClientWidth = 972
       object VpContactButtonBar1: TVpContactButtonBar
         Left = 0
-        Height = 594
+        Height = 625
         Top = 0
         Width = 40
         DrawingStyle = dsFlat
@@ -245,9 +246,9 @@ object Form1: TForm1
       end
       object VpContactGrid1: TVpContactGrid
         Left = 40
-        Height = 594
+        Height = 625
         Top = 0
-        Width = 888
+        Width = 932
         DataStore = VpZeosDatastore1
         ControlLink = VpControlLink1
         Color = clWindow
@@ -270,8 +271,8 @@ object Form1: TForm1
       'AutoEncodeStrings=ON'
     )
     Port = 0
-    left = 136
-    top = 136
+    Left = 136
+    Top = 136
   end
   object VpZeosDatastore1: TVpZeosDatastore
     CategoryColorMap.Category0.Color = clNavy
@@ -300,25 +301,21 @@ object Form1: TForm1
     PlayEventSounds = True
     AutoCreate = True
     Daybuffer = 31
-    left = 136
-    top = 200
+    Left = 136
+    Top = 200
   end
   object VpControlLink1: TVpControlLink
     DataStore = VpZeosDatastore1
-    Printer.BottomMargin = 0
     Printer.DayStart = h_08
     Printer.DayEnd = h_05
     Printer.Granularity = gr30Min
-    Printer.LeftMargin = 0
     Printer.MarginUnits = imAbsolutePixel
     Printer.PrintFormats = <>
-    Printer.RightMargin = 0
-    Printer.TopMargin = 0
-    left = 136
-    top = 264
+    Left = 136
+    Top = 264
   end
   object VpResourceEditDialog1: TVpResourceEditDialog
-    Version = 'v1.10'
+    Version = 'v1.12'
     DataStore = VpZeosDatastore1
     Options = []
     Placement.Position = mpCenter
@@ -326,11 +323,11 @@ object Form1: TForm1
     Placement.Left = 10
     Placement.Height = 250
     Placement.Width = 400
-    left = 136
-    top = 335
+    Left = 136
+    Top = 335
   end
   object ZTable1: TZTable
-    left = 136
-    top = 536
+    Left = 136
+    Top = 536
   end
 end
diff --git a/components/tvplanit/examples/datastores/zeos/unit1.pas b/components/tvplanit/examples/datastores/zeos/unit1.pas
index 6a9aa05d2..af9c5464a 100644
--- a/components/tvplanit/examples/datastores/zeos/unit1.pas
+++ b/components/tvplanit/examples/datastores/zeos/unit1.pas
@@ -80,7 +80,7 @@ procedure TForm1.FormCreate(Sender: TObject);
 begin
   try
     ZConnection1.Database := AppendPathDelim(Application.Location) + DBFILENAME;
-    ZConnection1.Protocol := 'sqlite-3';
+    ZConnection1.Protocol := 'sqlite'; //-3';
 
 //    ZConnection1.Connect;    // activate this to test issue #33717