diff --git a/components/tvplanit/source/vpdatepropedit.lfm b/components/tvplanit/source/vpdatepropedit.lfm
index d80ccd806..2018ff0b5 100644
--- a/components/tvplanit/source/vpdatepropedit.lfm
+++ b/components/tvplanit/source/vpdatepropedit.lfm
@@ -1,29 +1,29 @@
 object frmDatePropertyEditor: TfrmDatePropertyEditor
   Left = 349
-  Height = 193
+  Height = 201
   Top = 233
-  Width = 219
+  Width = 231
   HorzScrollBar.Page = 218
   VertScrollBar.Page = 192
   BorderStyle = bsDialog
   Caption = 'Select Date'
-  ClientHeight = 193
-  ClientWidth = 219
+  ClientHeight = 201
+  ClientWidth = 231
   Position = poDefaultPosOnly
   LCLVersion = '1.7'
   object Button1: TButton
-    Left = 56
+    Left = 69
     Height = 25
-    Top = 160
+    Top = 168
     Width = 75
     Caption = 'OK'
     ModalResult = 1
     TabOrder = 0
   end
   object Button2: TButton
-    Left = 136
+    Left = 149
     Height = 25
-    Top = 160
+    Top = 168
     Width = 75
     Caption = 'Cancel'
     ModalResult = 2
@@ -31,9 +31,9 @@ object frmDatePropertyEditor: TfrmDatePropertyEditor
   end
   object VpCalendar1: TVpCalendar
     Left = 8
-    Height = 140
+    Height = 152
     Top = 8
-    Width = 200
+    Width = 216
     ParentFont = False
     BorderStyle = bsNone
     Colors.ActiveDay = clRed
diff --git a/components/tvplanit/source/vpdatepropedit.pas b/components/tvplanit/source/vpdatepropedit.pas
index 5bf7351de..e4b69c859 100644
--- a/components/tvplanit/source/vpdatepropedit.pas
+++ b/components/tvplanit/source/vpdatepropedit.pas
@@ -37,7 +37,8 @@ uses
   Windows,
   {$ENDIF}
   Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, VpEdPop, VpDateEdit, VpBase, VpBaseDS, VpCalendar;
+  StdCtrls, //VpEdPop, VpDateEdit, VpBase, VpBaseDS,
+  VpCalendar;
 
 type
   TfrmDatePropertyEditor = class(TForm)
diff --git a/components/tvplanit/source/vpreg.pas b/components/tvplanit/source/vpreg.pas
index 0ed684885..7f6b1fd8e 100644
--- a/components/tvplanit/source/vpreg.pas
+++ b/components/tvplanit/source/vpreg.pas
@@ -45,23 +45,14 @@ uses
   Dialogs,
   {$IFDEF VERSION6}
   {$IFNDEF LCL}
-  DesignIntf,
-  DesignEditors,
-  VCLEditors,
+  DesignIntf, DesignEditors, VCLEditors,
   {$ELSE}
-  PropEdits,
-  LazarusPackageIntf,
-  FieldsEditor,
-  ComponentEditors,
+  PropEdits, LazarusPackageIntf, FieldsEditor,  ComponentEditors,
   {$ENDIF}
   {$ELSE}
   DsgnIntf,
   {$ENDIF}
-  Classes,
-  Controls,
-  TypInfo,
-  Forms,
-  SysUtils,
+  Classes, Controls, TypInfo, Forms, SysUtils,
   VpDatePropEdit;
 
 type
@@ -128,14 +119,20 @@ uses
   VpCalendar,                 { Calendar Component                           }
   VpNavBar,                   { Navigation Bar Component                     }
   VpBaseDS,                   { Base DataStore Classes                       }
-//  VpBDEDS,                    { DataStore Component                          }
   VpDayView,                  { Day View Component                           }
   VpWeekView,                 { Week View Component                          }
   VpMonthView,                { Month View Component                         }
   VpContactGrid,              { ContactGrid Component                        }
-  VpDateEdit,                 { DateEdit Component                           }
   VpTaskList,                 { Task List Component                          }
+ {$IFDEF DELPHI}
+  VpBDEDS,                    { DataStore Component                          }
+  VpDateEdit,                 { DateEdit Component                           }
+ {$ENDIF}
+ {$IFDEF LCL}
   VpBufDS,                    { Datastore for TBufDataset                    }
+  //  VpSdfDS                     { Datastore for TSdfDataset                    }
+  //  VpDbfDS,                    { Datastore for dbase files                    }
+ {$ENDIF}
   VpFlxDS,                    { Flexible DataStore                           }
   VpContactEditDlg,           { Contact Edit Dialog Component                }
   VpTaskEditDlg,              { Task Edit Dialog Component                   }
@@ -256,13 +253,13 @@ end;
 
 function TVpDateProperty.GetValue : string;
 begin
-  Result := FormatDateTime ('ddddd', GetFloatValue);
+  Result := FormatDateTime('ddddd', GetFloatValue);
 end;
 {=====}
 
 procedure TVpDateProperty.SetValue (const Value : string);
 begin
-  SetFloatValue (StrToDate (Value));
+  SetFloatValue(StrToDate (Value));
 end;
 {=====}
 
@@ -307,112 +304,117 @@ begin
 end;
 
 {*** component registration ***}
-  procedure Register;
-  begin
-    { register component editors }
-    RegisterComponentEditor(TVpNavBar, TVpNavBarEditor);
-    RegisterComponentEditor(TVpControlLink, TVpPrtFmtPropertyEditor);
-    RegisterComponentEditor(TVpFlexDataStore, TVpFlexDSEditor);
+procedure Register;
+begin
+  { register component editors }
+  RegisterComponentEditor(TVpNavBar, TVpNavBarEditor);
+  RegisterComponentEditor(TVpControlLink, TVpPrtFmtPropertyEditor);
+  RegisterComponentEditor(TVpFlexDataStore, TVpFlexDSEditor);
 
-    { register the About Box property editor for the Version properties        }
-    RegisterPropertyEditor(TypeInfo(string), TVpCollectionItem,
-      'Version', TVpAboutProperty);
-    RegisterPropertyEditor(TypeInfo(string), TVpComponent,
-      'Version', TVpAboutProperty);
-    RegisterPropertyEditor(TypeInfo(string), TVpNavBar,
-      'Version', TVpAboutProperty);
-    RegisterPropertyEditor(TypeInfo(string), TVpCalendar,
-      'Version', TVpAboutProperty);
-    RegisterPropertyEditor(TypeInfo(string), TVpLEDLabel,
-      'Version', TVpAboutProperty);
-    RegisterPropertyEditor(TypeInfo(string), TVpClock,
-      'Version', TVpAboutProperty);
-    RegisterPropertyEditor(TypeInfo(string), TVpResourceCombo,
-      'Version', TVpAboutProperty);
-    RegisterPropertyEditor(TypeInfo(string), TVpCustomControl,
-      'Version', TVpAboutProperty);
-    RegisterPropertyEditor(TypeInfo(string), TVpControlLink,
-      'Version', TVpAboutProperty);
-  {$IFNDEF LCL}
-    RegisterPropertyEditor(TypeInfo(string), TVpBDEDataStore,
-      'Version', TVpAboutProperty);
-  {$ENDIF}
-    RegisterPropertyEditor(TypeInfo(string), TVpFlexDataStore,
-      'Version', TVpAboutProperty);
-    RegisterPropertyEditor(TypeInfo(string), TVpDateEdit,
-      'Version', TVpAboutProperty);
-    RegisterPropertyEditor(TypeInfo(string), TVpBaseDialog,
-      'Version', TVpAboutProperty);
-    RegisterPropertyEditor(TypeInfo(string), TVpPrintFormatComboBox,
-      'Version', TVpAboutProperty);
+  { register the About Box property editor for the Version properties        }
+  RegisterPropertyEditor(TypeInfo(string), TVpCollectionItem,
+    'Version', TVpAboutProperty);
+  RegisterPropertyEditor(TypeInfo(string), TVpComponent,
+    'Version', TVpAboutProperty);
+  RegisterPropertyEditor(TypeInfo(string), TVpNavBar,
+    'Version', TVpAboutProperty);
+  RegisterPropertyEditor(TypeInfo(string), TVpCalendar,
+    'Version', TVpAboutProperty);
+  RegisterPropertyEditor(TypeInfo(string), TVpLEDLabel,
+    'Version', TVpAboutProperty);
+  RegisterPropertyEditor(TypeInfo(string), TVpClock,
+    'Version', TVpAboutProperty);
+  RegisterPropertyEditor(TypeInfo(string), TVpResourceCombo,
+    'Version', TVpAboutProperty);
+  RegisterPropertyEditor(TypeInfo(string), TVpCustomControl,
+    'Version', TVpAboutProperty);
+  RegisterPropertyEditor(TypeInfo(string), TVpControlLink,
+    'Version', TVpAboutProperty);
+{$IFNDEF LCL}
+  RegisterPropertyEditor(TypeInfo(string), TVpBDEDataStore,
+    'Version', TVpAboutProperty);
+  RegisterPropertyEditor(TypeInfo(string), TVpDateEdit,
+    'Version', TVpAboutProperty);
+{$ENDIF}
+  RegisterPropertyEditor(TypeInfo(string), TVpFlexDataStore,
+    'Version', TVpAboutProperty);
+  RegisterPropertyEditor(TypeInfo(string), TVpBaseDialog,
+    'Version', TVpAboutProperty);
+  RegisterPropertyEditor(TypeInfo(string), TVpPrintFormatComboBox,
+    'Version', TVpAboutProperty);
 
-    {register the BDE Alias and Driver properties                             }
-  {$IFNDEF LCL}
-    RegisterPropertyEditor(TypeInfo(string), TVpBDEDataStore,
-      'AliasName', TAliasNameProperty);
-    RegisterPropertyEditor(TypeInfo(string), TVpBDEDataStore,
-      'DriverName', TDriverNameProperty);
-   {$ENDIF}
+  {register the BDE Alias and Driver properties                             }
+{$IFNDEF LCL}
+  RegisterPropertyEditor(TypeInfo(string), TVpBDEDataStore,
+    'AliasName', TAliasNameProperty);
+  RegisterPropertyEditor(TypeInfo(string), TVpBDEDataStore,
+    'DriverName', TDriverNameProperty);
+ {$ENDIF}
 
-    // LCL: Registering next property editor inhibits that the DataStore
-    // property combo of the DayView lists the available datastores.
+  // LCL: Registering next property editor inhibits that the DataStore
+  // property combo of the DayView lists the available datastores.
 
-    {register the DayView properties                                          }
-    //RegisterPropertyEditor(TypeInfo(TVpCustomDataStore), TVpDayView,
-    //  'DataStore', TDataStoreProperty);
+  {register the DayView properties                                          }
+  //RegisterPropertyEditor(TypeInfo(TVpCustomDataStore), TVpDayView,
+  //  'DataStore', TDataStoreProperty);
 
-    {register the property editor for the DataStore's DefaultAlarmWav         }
-    RegisterPropertyEditor(TypeInfo(string), TVpCustomDataStore,
-      'DefaultEventSound', TWavFileProperty);
+  {register the property editor for the DataStore's DefaultAlarmWav         }
+  RegisterPropertyEditor(TypeInfo(string), TVpCustomDataStore,
+    'DefaultEventSound', TWavFileProperty);
 
-    RegisterPropertyEditor (TypeInfo (TDateTime),
-                            TVpPrintPreview,
-                            'StartDate',
-                            TVpDateProperty);
-    RegisterPropertyEditor (TypeInfo (TDateTime),
-                            TVpPrintPreview,
-                            'EndDate',
-                            TVpDateProperty);
-    RegisterPropertyEditor (TypeInfo (TDateTime),
-                            TVpPrintPreviewDialog,
-                            'StartDate',
-                            TVpDateProperty);
-    RegisterPropertyEditor (TypeInfo (TDateTime),
-                            TVpPrintPreviewDialog,
-                            'EndDate',
-                            TVpDateProperty);
+  RegisterPropertyEditor (TypeInfo (TDateTime),
+                          TVpPrintPreview,
+                          'StartDate',
+                          TVpDateProperty);
+  RegisterPropertyEditor (TypeInfo (TDateTime),
+                          TVpPrintPreview,
+                          'EndDate',
+                          TVpDateProperty);
+  RegisterPropertyEditor (TypeInfo (TDateTime),
+                          TVpPrintPreviewDialog,
+                          'StartDate',
+                          TVpDateProperty);
+  RegisterPropertyEditor (TypeInfo (TDateTime),
+                          TVpPrintPreviewDialog,
+                          'EndDate',
+                          TVpDateProperty);
 
-    RegisterPropertyEditor (TypeInfo (string), TVpControlLink,
-                            'LocalizationFile', TVpLocalizeFileNameProperty);
+  RegisterPropertyEditor (TypeInfo (string), TVpControlLink,
+                          'LocalizationFile', TVpLocalizeFileNameProperty);
+
+  {register Visual PlanIt components with the IDE}
+  RegisterComponents('Visual PlanIt', [
+    TVpLEDLabel,
+    TVpClock,
+    TVpCalendar,
+    TVpNavBar,
+    TVpFlexDataStore,
+{$IFDEF DELPHI}
+    TVpBDEDataStore,    // BDE is not available in Lazarus
+    TVpDateEdit,        // Does not work in Lazarus
+{$ENDIF}
+{$IFDEF LCL}
+    TVpBufDSDatastore,
+    //TVpSdfDatastore,       // to do (maybe)...
+    //TVpDbfDatastore,       // to do...
+{$ENDIF}
+    TVpControlLink,
+    TVpPrintPreview,
+    TVpPrintFormatComboBox,
+    TVpResourceCombo,
+    TVpDayView,
+    TVpWeekView,
+    TVpMonthView,
+    TVpContactGrid,
+    TVpContactButtonBar,
+    TVpTaskList,
+    TVpNotificationDialog,
+    TVpResourceEditDialog,
+    TVpEventEditDialog,
+    TVpContactEditDialog,
+    TVpTaskEditDialog,
+    TVpPrintFormatEditDialog,
+    TVpPrintPreviewDialog]);
+end;
 
-    {register Visual PlanIt components with the IDE}
-    RegisterComponents('Visual PlanIt', [
-      TVpLEDLabel,
-      TVpClock,
-      TVpCalendar,
-      TVpNavBar,
-      TVpBufDSDatastore,
-      TVpFlexDataStore,
-  {$IFNDEF LCL}
-      TVpBDEDataStore,    // BDE is not available in Lazarus
-  {$ENDIF}
-      TVpControlLink,
-      TVpPrintPreview,
-      TVpPrintFormatComboBox,
-      TVpDateEdit,
-      TVpResourceCombo,
-      TVpDayView,
-      TVpWeekView,
-      TVpMonthView,
-      TVpContactGrid,
-      TVpContactButtonBar,                                               
-      TVpTaskList,
-      TVpNotificationDialog,
-      TVpResourceEditDialog,
-      TVpEventEditDialog,
-      TVpContactEditDialog,
-      TVpTaskEditDialog,
-      TVpPrintFormatEditDialog,
-      TVpPrintPreviewDialog]);
-  end;
 end.