diff --git a/components/tvplanit/examples/calendar/main.lfm b/components/tvplanit/examples/calendar/main.lfm
index d979d7280..bd9cd0de9 100644
--- a/components/tvplanit/examples/calendar/main.lfm
+++ b/components/tvplanit/examples/calendar/main.lfm
@@ -3,11 +3,10 @@ object Form1: TForm1
   Height = 607
   Top = 130
   Width = 565
-  Caption = 'Form1'
+  Caption = 'TvPlanIt Calendar Demo'
   ClientHeight = 607
   ClientWidth = 565
   OnCreate = FormCreate
-  LCLVersion = '2.3.0.0'
   object VpCalendar1: TVpCalendar
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
@@ -18,12 +17,14 @@ object Form1: TForm1
     Height = 319
     Top = 8
     Width = 309
+    PopupMenu = VpCalendar1.default
     DataStore = VpIniDatastore1
     ControlLink = VpControlLink1
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Left = 120
     BorderSpacing.Right = 120
     BorderSpacing.Around = 8
+    BorderStyle = bsSingle
     Colors.ActiveDay = clWindow
     Colors.ActiveDayBorder = clWindowText
     Colors.ActiveDayText = clWindowText
@@ -260,7 +261,9 @@ object Form1: TForm1
       Width = 53
       BorderSpacing.Top = 8
       Caption = 'Border'
+      Checked = True
       OnChange = cbBorderChange
+      State = cbChecked
       TabOrder = 2
     end
     object lblDayNameWidth: TLabel
diff --git a/components/tvplanit/examples/gadgets/unit1.lfm b/components/tvplanit/examples/gadgets/unit1.lfm
index 51a4b90d5..3c902c613 100644
--- a/components/tvplanit/examples/gadgets/unit1.lfm
+++ b/components/tvplanit/examples/gadgets/unit1.lfm
@@ -1,15 +1,13 @@
 object Form1: TForm1
   Left = 320
-  Height = 311
+  Height = 292
   Top = 160
-  Width = 473
-  AutoSize = True
-  Caption = 'Form1'
-  ClientHeight = 311
-  ClientWidth = 473
+  Width = 457
+  Caption = 'TvPlanit Gadgets demo'
+  ClientHeight = 292
+  ClientWidth = 457
   Font.Color = clWindowText
   OnShow = FormShow
-  LCLVersion = '2.3.0.0'
   object VpClock: TVpClock
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Panel1
@@ -53,16 +51,18 @@ object Form1: TForm1
   object BtnStartStop: TButton
     AnchorSideLeft.Control = RgClockMode
     AnchorSideLeft.Side = asrBottom
+    AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = RgClockMode
     AnchorSideBottom.Side = asrBottom
     Left = 342
     Height = 25
-    Top = 203
-    Width = 98
+    Top = 190
+    Width = 80
     Anchors = [akLeft]
+    AutoSize = True
     BorderSpacing.Left = 16
-    BorderSpacing.Right = 16
     Caption = 'Start'
+    Constraints.MinWidth = 80
     OnClick = BtnStartStopClick
     TabOrder = 6
   end
@@ -107,6 +107,7 @@ object Form1: TForm1
     BorderSpacing.Top = 16
     BorderSpacing.Right = 16
     Caption = 'Count-down time:'
+    Color = clDefault
     FocusControl = EdCountDownTime
     ParentColor = False
     Visible = False
@@ -117,7 +118,7 @@ object Form1: TForm1
     AnchorSideBottom.Control = BtnStartStop
     Left = 342
     Height = 19
-    Top = 172
+    Top = 159
     Width = 98
     Anchors = [akLeft, akBottom]
     BorderSpacing.Top = 4
@@ -138,6 +139,7 @@ object Form1: TForm1
     BorderSpacing.Top = 16
     BorderSpacing.Bottom = 16
     Caption = 'Elapsed...'
+    Color = clDefault
     ParentColor = False
   end
   object RgDisplayMode: TRadioGroup
@@ -178,7 +180,7 @@ object Form1: TForm1
     AnchorSideBottom.Control = BtnStartStop
     Left = 342
     Height = 19
-    Top = 172
+    Top = 159
     Width = 85
     Anchors = [akLeft, akBottom]
     BorderSpacing.Top = 12
@@ -233,15 +235,15 @@ object Form1: TForm1
     AnchorSideLeft.Control = BtnStartStop
     AnchorSideTop.Control = BtnStartStop
     AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = BtnStartStop
     AnchorSideRight.Side = asrBottom
     Left = 342
     Height = 25
-    Top = 230
-    Width = 98
-    Anchors = [akTop, akLeft, akRight]
+    Top = 217
+    Width = 80
+    AutoSize = True
     BorderSpacing.Top = 2
     Caption = 'Pause'
+    Constraints.MinWidth = 80
     OnClick = BtnPauseResumeClick
     TabOrder = 8
     Visible = False