diff --git a/components/tvplanit/source/vpalarmdlg.lfm b/components/tvplanit/source/vpalarmdlg.lfm
index 4d3829524..086daf9bd 100644
--- a/components/tvplanit/source/vpalarmdlg.lfm
+++ b/components/tvplanit/source/vpalarmdlg.lfm
@@ -16,7 +16,7 @@ object AlarmNotifyForm: TAlarmNotifyForm
   OnKeyDown = FormKeyDown
   OnShow = FormShow
   Position = poDefault
-  LCLVersion = '1.6.4.0'
+  LCLVersion = '2.3.0.0'
   object SnoozeCaption: TLabel
     AnchorSideLeft.Control = lTime
     AnchorSideTop.Control = Bevel1
@@ -31,6 +31,7 @@ object AlarmNotifyForm: TAlarmNotifyForm
     BorderSpacing.Right = 8
     BorderSpacing.Bottom = 8
     Caption = 'SnoozeCaption'
+    Color = clDefault
     Constraints.MinWidth = 200
     ParentColor = False
   end
@@ -44,6 +45,7 @@ object AlarmNotifyForm: TAlarmNotifyForm
     Width = 45
     BorderSpacing.Top = 4
     Caption = 'lSubject'
+    Color = clDefault
     Font.Style = [fsBold]
     ParentColor = False
     ParentFont = False
@@ -58,6 +60,7 @@ object AlarmNotifyForm: TAlarmNotifyForm
     BorderSpacing.Left = 8
     BorderSpacing.Top = 8
     Caption = 'lTime'
+    Color = clDefault
     ParentColor = False
   end
   object DismissBtn: TButton
@@ -162,6 +165,7 @@ object AlarmNotifyForm: TAlarmNotifyForm
     BorderSpacing.Top = 8
     BorderSpacing.Right = 8
     Caption = 'lNotes'
+    Color = clDefault
     ParentColor = False
     WordWrap = True
   end
@@ -180,7 +184,7 @@ object AlarmNotifyForm: TAlarmNotifyForm
     Shape = bsTopLine
   end
   object EventDialog: TVpEventEditDialog
-    Version = 'v1.05'
+    Version = 'v1.12'
     TimeFormat = tf24Hour
     Options = []
     Placement.Position = mpCenterTop
@@ -188,7 +192,7 @@ object AlarmNotifyForm: TAlarmNotifyForm
     Placement.Left = 10
     Placement.Height = 412
     Placement.Width = 705
-    left = 224
-    top = 16
+    Left = 224
+    Top = 16
   end
 end
diff --git a/components/tvplanit/source/vpalarmdlg.pas b/components/tvplanit/source/vpalarmdlg.pas
index dae4b7092..6ead751ae 100644
--- a/components/tvplanit/source/vpalarmdlg.pas
+++ b/components/tvplanit/source/vpalarmdlg.pas
@@ -123,7 +123,7 @@ var
   AlarmNotifyForm: TAlarmNotifyForm;
 begin
   if (Event <> nil) and (not Event.AlertDisplayed) then begin
-   AlarmNotifyForm := TAlarmNotifyForm.Create(Self);
+    AlarmNotifyForm := TAlarmNotifyForm.Create(Self);
     try
       try
         Event.AlertDisplayed := true;
diff --git a/components/tvplanit/source/vpbaseds.pas b/components/tvplanit/source/vpbaseds.pas
index bd06bdb3b..0749cd06a 100644
--- a/components/tvplanit/source/vpbaseds.pas
+++ b/components/tvplanit/source/vpbaseds.pas
@@ -402,10 +402,8 @@ type
     property AfterEnter;
     property AfterExit;
     property OnMouseWheel;
-
   end;
 
-
   {TVpControlLink}
   TVpControlLink = class(TVpComponent)
   private
@@ -453,7 +451,6 @@ type
   end;
 
 
-
 implementation
 
 uses
@@ -510,7 +507,6 @@ begin
   
   SetActiveDate(Now);  
 end;
-{=====}
 
 destructor TVpCustomDataStore.Destroy;
 begin
@@ -532,7 +528,6 @@ begin
   inherited;
 end;
 
-
 procedure TVpCustomDataStore.DeleteResource(Res: TVpResource);
 begin
   if Res = nil then
@@ -603,7 +598,6 @@ begin
         FNotifiers.Delete (i);
       end;
 end;
-{=====}
 
 procedure TVpCustomDataStore.DeregisterWatcher(Watcher: THandle);
 var
@@ -618,7 +612,6 @@ begin
           Exit;
         end;
 end;
-{=====}
 
 procedure TVpCustomDataStore.dsOnTimer(Sender: TObject);
 var
@@ -671,7 +664,6 @@ begin
   DecodeTime(Now, NHour, NMin, NSec, NMSec);
   dsAlertTimer.Interval := (60 - NSec) * 1000;
 end;
-{=====}
 
 procedure TVpCustomDataStore.dsDoOnAlert(Event: TVpEvent);
 begin
@@ -779,14 +771,12 @@ begin
   if Assigned(FOnDateChanged) then
     FOnDateChanged(Self, FActiveDate);
 end;
-{=====}
 
 procedure TVpCustomDataStore.SetAutoConnect(Value: Boolean);
 begin
   if Value <> FAutoConnect then
     FAutoConnect := value;
 end;
-{=====}
 
 procedure TVpCustomDataStore.SetConnected(const Value: boolean);
 var
@@ -861,7 +851,6 @@ begin
       NotifyDependents;
   end;
 end;
-{=====}
 
 procedure TVpCustomDataStore.SetEventTimerEnabled(Value: Boolean);
 begin
@@ -875,14 +864,12 @@ begin
     end;
   end;
 end;
-{=====}
 
 procedure TVpCustomDataStore.SetDayBuffer(Value: Integer);
 begin
   FDayBuffer := Value;
   SetRange(FActiveDate - FDayBuffer, FActiveDate + FDayBuffer);
 end;
-{=====}
 
 procedure TVpCustomDataStore.Load;
 begin
@@ -906,28 +893,24 @@ begin
   if not Loading then
     NotifyDependents;
 end;
-{=====}
 
 procedure TVpCustomDataStore.RefreshContacts;
 begin
   if not Loading then
     NotifyDependents;
 end;
-{=====}
 
 procedure TVpCustomDataStore.RefreshTasks;
 begin
   if not Loading then
     NotifyDependents;
 end;
-{=====}
 
 procedure TVpCustomDataStore.RefreshResource;
 begin
   if not Loading then
     NotifyDependents;
 end;
-{=====}
 
 procedure TVpCustomDataStore.PurgeResource(Res: TVpResource);
 begin
@@ -999,7 +982,6 @@ begin
   NewHandle.Handle := Watcher;
   FNotifiers.Add(NewHandle);
 end;
-{=====}
 
 procedure TVpCustomDataStore.NotifyDependents;
 var
@@ -1016,7 +998,6 @@ begin
   end;
   NotifyLinked;
 end;
-{=====}
 
 procedure TVpCustomDataStore.SetRange(StartTime, EndTime: TDateTime);
 begin
@@ -1136,6 +1117,7 @@ begin
   FLinkedOwner := nil;
 end;
 
+
 { TVpEventDragObject }
 
 function TVpEventDragObject.GetDragImages: TDragImageList;
@@ -1158,7 +1140,6 @@ begin
   FDragTitle := ADragTitle;
   bmp := TBitmap.Create;
   try
-//    bmp.Canvas.Font.Name := 'Arial';
     bmp.Canvas.Font.Style := Bmp.Canvas.Font.Style + [fsItalic];
     bmp.Height := ACellRect.Bottom - ACellRect.Top;
     bmp.Width := ACellRect.Right - ACellRect.Left;
@@ -1221,7 +1202,6 @@ destructor TVpResourceCombo.Destroy;
 begin
   inherited;
 end;
-{=====}
 
 {$IFNDEF LCL}
 procedure TVpResourceCombo.CNCommand (var Msg: TWMCommand);
@@ -1235,20 +1215,17 @@ begin
     inherited;
 end;
 {$ENDIF}
-{=====}
 
 procedure TVpResourceCombo.VpDataStoreChanged(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF});
 begin
   Unused(Msg);
   LoadItems;
 end;
-{=====}
 
 function TVpResourceCombo.GetAbout: string;
 begin
   Result := VpVersionStr;
 end;
-{=====}
 
 procedure TVpResourceCombo.LoadItems;
 var
@@ -1279,7 +1256,6 @@ begin
     rcLoading := false;
   end;
 end;
-{=====}
 
 procedure TVpResourceCombo.ResourceChanged(Sender: TObject);
 begin
@@ -1289,14 +1265,13 @@ begin
     OldItemIndex := ItemIndex;
   end;
 end;
-{=====}
 
 procedure TVpResourceCombo.SetAbout(const Value: string);
 begin
   Unused(Value);
   //Empty on purpose
 end;
-{=====}
+
 procedure TVpResourceCombo.SetResourceUpdateStyle(const v: TVpResourceUpdate);
 begin
   if v <> FResourceUpdateStyle then begin
@@ -1355,7 +1330,6 @@ begin
 end;
 
 
-
 { TVpLinkableControl }
 
 constructor TVpLinkableControl.Create(AOwner: TComponent);
@@ -1376,7 +1350,6 @@ begin
   end;
   FLastPrintLine := -1;
 end;
-{=====}
 
 destructor TVpLinkableControl.Destroy;
 begin
@@ -1384,7 +1357,6 @@ begin
     ControlLink.Detach(Self);
   inherited;
 end;
-{=====}
 
 function TVpLinkableControl.CheckCreateResource : Boolean;
 var
@@ -1459,7 +1431,6 @@ begin
     Invalidate;
   end;
 end;
-{=====}
 
 procedure TVpLinkableControl.SetControlLink(const Value: TVpControlLink);
 var
@@ -1493,21 +1464,18 @@ begin
     end;
   end;
 end;
-{=====}
 
 procedure TVpLinkableControl.CMEnter(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF});
 begin
   Unused(Msg);
   invalidate;
 end;
-{=====}
 
 procedure TVpLinkableControl.CMExit(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF});
 begin
   Unused(Msg);
   invalidate;
 end;
-{=====}
 
 
 { TVpControlLink }
@@ -1547,7 +1515,6 @@ begin
   FPrinter := TVpPrinter.Create (Self);
   FLocalization := TVpLocalization.Create;
 end;
-{=====}
 
 destructor TVpControlLink.Destroy;
 var
@@ -1574,7 +1541,6 @@ begin
   DependentList.Free;
   inherited;
 end;
-{=====}
 
 procedure TVpControlLink.ReleaseDependents;
 var
@@ -1582,10 +1548,7 @@ var
 begin
   for I := pred(DependentList.Count) downto 0 do
     Detach(TVpDependentInfo(DependentList[i]).Component);
-//  for I := 0 to pred(DependentList.Count) do
-//    Detach(TVpDependentInfo(DependentList.List^[I]).Component);
 end;
-{=====}
 
 procedure TVpControlLink.Detach(Sender: TComponent);
 var
@@ -1593,10 +1556,8 @@ var
 begin
   try
     for I := 0 to pred(DependentList.Count) do
-//      if TVpDependentInfo(DependentList.List^[I]).Component = Sender then
       if TVpDependentInfo(DependentList[I]).Component = Sender then
       begin
-//        TVpDependentInfo(DependentList.List^[I]).Free;
         TVpDependentInfo(DependentList[I]).Free;
         DependentList.Delete(I);
         if Sender is TVpLinkableControl then
@@ -1607,7 +1568,6 @@ begin
     // swallow exceptions
   end;
 end;
-{=====}
 
 procedure TVpControlLink.Attach(Sender: TComponent);
 var
@@ -1617,7 +1577,6 @@ var
 begin
   Exists := false;
   for I := 0 to pred(DependentList.Count) do
-//    if TVpDependentInfo(DependentList.List^[I]).Component = Sender then begin
     if TVpDependentInfo(DependentList[I]).Component = Sender then begin
       Exists := true;
       Break;
@@ -1631,19 +1590,16 @@ begin
     DependentList.Add(Link);
   end;
 end;
-{=====}
 
 function TVpControlLink.GetDependentList : TList;
 begin
   Result := DependentList;
 end;
-{=====}
 
 procedure TVpControlLink.LoadLocalizationInfo (const FileName : string);
 begin
   LocalizationFile := FileName;
 end;
-{=====}
 
 procedure TVpControlLink.Notify(Sender: TComponent;
   NotificationType: TVpNotificationType; const Value: Variant);
@@ -1658,7 +1614,6 @@ begin
       end;
     end;
 end;
-{=====}
 
 procedure TVpControlLink.SetCityStateZipFormat(const Value: String);
 begin
@@ -1675,14 +1630,13 @@ begin
     if FDatastore <> nil then FDatastore.LinkToControls(Owner);
   end;
 end;
-{=====}
+
 procedure TVpControlLink.SetDefaultCountry (const v : string);
 begin
   if v <> FDefaultCountry then begin
     FDefaultCountry := v;
   end;
 end;
-{=====}
 
 procedure TVpControlLink.SetLocalizationFile (const v : string);
 var
@@ -1701,13 +1655,11 @@ begin
     end;
   end;
 end;
-{=====}
 
 procedure TVpControlLink.SetPrinter (const v : TVpPrinter);
 begin
   FPrinter.Assign (v);
 end;
-{=====}
 
 procedure TVpControlLink.TriggerOnGetVariable(Sender  : TObject;
   VarName: string;  Found: Boolean; var Value: string;
@@ -1716,7 +1668,6 @@ begin
   if Assigned (FOnGetVariable) then
     FOnGetVariable (Sender, VarName, Found, Value, Change);
 end;
-{=====}
 
 procedure TVpControlLink.TriggerOnPageEnd(Sender: TObject; PageNum: Integer;
   ADate: TDateTime;  LastPage: Boolean);
@@ -1724,7 +1675,6 @@ begin
   if Assigned (FOnPageEnd) then
     FOnPageEnd (Sender, PageNum, ADate, LastPage);
 end;
-{=====}
 
 procedure TVpControlLink.TriggerOnPageStart(Sender: TObject; PageNum : Integer;
   ADate   : TDateTime);
@@ -1732,6 +1682,5 @@ begin
   if Assigned (FOnPageStart) then
     FOnPageStart (Sender, PageNum, ADate);
 end;
-{=====}
 
 end.
diff --git a/components/tvplanit/source/vpcontactgrid.pas b/components/tvplanit/source/vpcontactgrid.pas
index 3ecbad041..335581ad0 100644
--- a/components/tvplanit/source/vpcontactgrid.pas
+++ b/components/tvplanit/source/vpcontactgrid.pas
@@ -322,6 +322,7 @@ uses
 (*****************************************************************************)
 { TVpContactHeadAttr }
 (*****************************************************************************)
+
 constructor TVpContactHeadAttr.Create(AOwner: TVpContactGrid);
 begin
   inherited Create;
@@ -331,13 +332,11 @@ begin
   FColor := clSilver;
   FBordered := true;
 end;
-{=====}
 
 destructor TVpContactHeadAttr.Destroy;
 begin
   FFont.Free;
 end;
-{=====}
 
 procedure TVpContactHeadAttr.SetBordered(Value: Boolean);
 begin
@@ -346,7 +345,6 @@ begin
     Grid.Invalidate;
   end;
 end;
-{=====}
 
 procedure TVpContactHeadAttr.SetColor(Value: TColor);
 begin
@@ -355,7 +353,6 @@ begin
     Grid.Invalidate;
   end;
 end;
-{=====}
 
 procedure TVpContactHeadAttr.SetFont(Value: TVpFont);
 begin
@@ -364,10 +361,11 @@ begin
     Grid.Invalidate;
   end;
 end;
-{=====}
 
 
+(*****************************************************************************)
 { TVpCGInPlaceEdit }
+(*****************************************************************************)
 
 constructor TVpCGInPlaceEdit.Create(AOwner: TComponent);
 begin
@@ -687,7 +685,6 @@ begin
     neInvalidate      : Invalidate;
   end;
 end;
-{=====}
 
 procedure TVpContactGrid.cgHookUp;
 var
@@ -703,7 +700,6 @@ begin
       end;
     end;
 end;
-{=====}
 
 function TVpContactGrid.ContactIsVisible(AIndex: Integer): Boolean;
 var
@@ -741,7 +737,6 @@ function TVpContactGrid.GetControlType : TVpItemType;
 begin
   Result := itContacts;
 end;
-{=====}
 
 procedure TVpContactGrid.DeleteActiveContact(Verify: Boolean);
 var
@@ -767,7 +762,6 @@ begin
     end;
   end;
 end;
-{=====}
 
 {$IFDEF LCL}
 function TVpContactGrid.DoMouseWheel(Shift: TShiftState; WheelDelta: Integer;
@@ -803,14 +797,12 @@ procedure TVpContactGrid.Paint;
 begin
   RenderToCanvas(Canvas, Rect(0, 0, Width, Height), ra0, 1, Now, -1, -1, gr30Min, False);
 end;
-{=====}
 
 procedure TVpContactGrid.PaintToCanvas(ACanvas: TCanvas; ARect: TRect;
   Angle: TVpRotationAngle);
 begin
   RenderToCanvas(ACanvas, ARect, Angle, 1, Now, -1, -1, gr30Min, True);
 end;
-{=====}
 
 procedure TVpContactGrid.RenderToCanvas(RenderCanvas: TCanvas;
   RenderIn: TRect; Angle: TVpRotationAngle; Scale: Extended;
@@ -875,7 +867,6 @@ begin
     end;
   end;
 end;
-{=====}                                                                  
 
 procedure TVpContactGrid.SetColor(Value: TColor);
 begin
@@ -884,7 +875,6 @@ begin
     Invalidate;
   end;
 end;
-{=====}
 
 procedure TVpContactGrid.cgCalcRowHeight;
 var
@@ -903,7 +893,6 @@ begin
   cgRowHeight := cgRowHeight + TextMargin * 2;
   Canvas.Font.Assign(SaveFont);
 end;
-{=====}
 
 procedure TVpContactGrid.SetDrawingStyle(const Value: TVpDrawingStyle);
 begin
@@ -912,7 +901,6 @@ begin
     Repaint;
   end;
 end;
-{=====}
 
 procedure TVpContactGrid.SetBarColor(Value: TColor);
 begin
@@ -921,13 +909,11 @@ begin
     Invalidate;
   end;
 end;
-{=====}
 
 function TVpContactGrid.GetBarWidth: Integer;
 begin
   result := FBarWidth - (ExtraBarWidth * 2);
 end;
-{=====}
 
 procedure TVpContactGrid.SetBarWidth(Value: Integer);
 begin
@@ -936,7 +922,6 @@ begin
     Invalidate;
   end;
 end;
-{=====}
 
 procedure TVpContactGrid.SetContactIndex(Value: Integer);
 begin
@@ -946,7 +931,6 @@ begin
   else
     FContactIndex := -1;
 end;
-{=====}
 
 procedure TVpContactGrid.SetColumnWidth(Value: Integer);
 begin
@@ -957,7 +941,6 @@ begin
     Invalidate;
   end;
 end;
-{=====}
 
 {$IFNDEF LCL}
 procedure TVpContactGrid.WMSize(var Msg: TWMSize);
@@ -972,7 +955,6 @@ begin
   { force a repaint }
   Invalidate;
 end;
-{=====}
 
 procedure TVpContactGrid.CreateParams(var Params: TCreateParams);
 begin
@@ -986,7 +968,6 @@ begin
 {$ENDIF}
   end;
 end;
-{=====}
 
 procedure TVpContactGrid.CreateWnd;
 begin
@@ -1164,7 +1145,6 @@ begin
     end;
   end;
 end;
-{=====}
 
 {$IFNDEF LCL}
 procedure TVpContactGrid.WMNCHitTest(var Msg: TWMNCHitTest);
@@ -1194,7 +1174,6 @@ begin
       Cursor := FOldCursor;
   end;
 end;
-{=====}
 
 {$IFNDEF LCL}
 procedure TVpContactGrid.WMSetCursor(var Msg: TWMSetCursor);
@@ -1211,7 +1190,6 @@ begin
   else inherited;
 end;
 {$ENDIF}
-{=====}
 
 {$IFNDEF LCL}
 procedure TVpContactGrid.WMLButtonDblClk(var Msg: TWMLButtonDblClk);
@@ -1245,8 +1223,6 @@ begin
   end;
 end;
 
-{=====}
-
 {$IFNDEF LCL}
 procedure TVpContactGrid.WMKillFocus(var Msg : TWMKillFocus);
 {$ELSE}
@@ -1308,7 +1284,6 @@ begin
   end;
   Invalidate;
 end;
-{=====}
 
 procedure TVpContactGrid.cgEditInPlace(Sender: TObject);
 begin
@@ -1318,7 +1293,6 @@ begin
   cgClickTimer.Enabled := false;
   EditContact;
 end;
-{=====}
 
 procedure TVpContactGrid.EditContact;
 var
@@ -1430,7 +1404,6 @@ begin
       cgInPlaceEditor.SelectAll;
   end;
 end;
-{=====}
 
 procedure TVpContactGrid.EndEdit(Sender: TObject);
 var
@@ -1756,7 +1729,6 @@ begin
   Key := 0;
   inherited;
 end;
-{=====}
 
 {$IFNDEF LCL}
 procedure TVpContactGrid.WMHScroll(var Msg: TWMHScroll);
@@ -1793,7 +1765,6 @@ begin
   end;
   Invalidate;
 end;
-{=====}
 
 {$IFNDEF LCL}
 procedure TVpContactGrid.VpDataStoreChanged (var Msg : TMessage);
@@ -1806,7 +1777,6 @@ begin
       DataStore.Resource.Contacts.ContactSort := SortBy;
 end;
 {$ENDIF}
-{=====}
 
 procedure TVpContactGrid.cgScrollHorizontal(Rows: Integer);
 begin
@@ -1823,7 +1793,6 @@ begin
 
   if FContactsBefore < 0 then FContactsBefore := 0;
 end;
-{=====}
 
 procedure TVpContactGrid.SetHScrollPos;
 var
@@ -1847,7 +1816,6 @@ begin
   end;
   SetScrollInfo(Handle, SB_HORZ, SI, True);
 end;
-{=====}
 
 procedure TVpContactGrid.SetPrintNumColumns (const v : Integer);
 begin
diff --git a/components/tvplanit/source/vpdata.pas b/components/tvplanit/source/vpdata.pas
index ca8394cda..af3debac6 100644
--- a/components/tvplanit/source/vpdata.pas
+++ b/components/tvplanit/source/vpdata.pas
@@ -2085,7 +2085,6 @@ begin
     end;
   end;
 end;
-{=====}
 
 procedure TVpSchedule.AllDayEventsByDate(Date: TDateTime; EventList: TList);
 var
@@ -2108,9 +2107,9 @@ begin
     end;
   end;
 end;
-{=====}
 
-(*  wp: Commented because it is not called from anywhere...
+
+(*  wp: Removed because it is not called from anywhere...
 
 { binary search }
 function TVpSchedule.FindTimeSlot(StartTime, EndTime: TDateTime): Boolean;