diff --git a/components/tvplanit/source/vpevnteditdlg.lfm b/components/tvplanit/source/vpevnteditdlg.lfm
index 907724bc0..e51cb500d 100644
--- a/components/tvplanit/source/vpevnteditdlg.lfm
+++ b/components/tvplanit/source/vpevnteditdlg.lfm
@@ -10,7 +10,7 @@ object DlgEventEdit: TDlgEventEdit
   Constraints.MinHeight = 378
   Constraints.MinWidth = 594
   Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  Font.Name = 'Default'
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poScreenCenter
@@ -24,7 +24,7 @@ object DlgEventEdit: TDlgEventEdit
     BevelOuter = bvNone
     ClientHeight = 41
     ClientWidth = 697
-    TabOrder = 0
+    TabOrder = 2
     object ResourceNameLbl: TLabel
       Left = 8
       Height = 16
@@ -67,18 +67,18 @@ object DlgEventEdit: TDlgEventEdit
   end
   object AppointmentGroupBox: TGroupBox
     Left = 8
-    Height = 211
+    Height = 218
     Top = 5
     Width = 679
     Anchors = [akTop, akLeft, akRight]
     Caption = 'Appointment'
-    ClientHeight = 193
+    ClientHeight = 199
     ClientWidth = 675
-    TabOrder = 1
+    TabOrder = 0
     object DescriptionLbl: TLabel
       Left = 5
       Height = 13
-      Top = 25
+      Top = 15
       Width = 77
       AutoSize = False
       Caption = 'Description:'
@@ -101,36 +101,36 @@ object DlgEventEdit: TDlgEventEdit
     object CategoryLbl: TLabel
       Left = 5
       Height = 13
-      Top = 49
+      Top = 41
       Width = 77
       AutoSize = False
       Caption = 'Category:'
       ParentColor = False
     end
     object StartTimeLbl: TLabel
-      Left = 47
+      Left = 32
       Height = 13
-      Top = 106
+      Top = 108
       Width = 59
       Alignment = taRightJustify
       AutoSize = False
-      Caption = 'StartTime:'
+      Caption = 'Start time:'
       ParentColor = False
     end
     object EndTimeLbl: TLabel
-      Left = 48
+      Left = 33
       Height = 13
-      Top = 130
+      Top = 135
       Width = 57
       Alignment = taRightJustify
       AutoSize = False
-      Caption = 'EndTime:'
+      Caption = 'End time:'
       ParentColor = False
     end
     object Image2: TImage
       Left = 352
       Height = 18
-      Top = 82
+      Top = 81
       Width = 18
       Picture.Data = {
         1754506F727461626C654E6574776F726B477261706869637802000089504E47
@@ -181,7 +181,7 @@ object DlgEventEdit: TDlgEventEdit
       ParentColor = False
     end
     object Image1: TImage
-      Left = 18
+      Left = 13
       Height = 25
       Top = 168
       Width = 23
@@ -213,7 +213,7 @@ object DlgEventEdit: TDlgEventEdit
       }
     end
     object SpeedButton1: TSpeedButton
-      Left = 325
+      Left = 329
       Height = 22
       Top = 167
       Width = 23
@@ -229,7 +229,7 @@ object DlgEventEdit: TDlgEventEdit
       }
     end
     object imgClock: TImage
-      Left = 18
+      Left = 13
       Height = 16
       Top = 80
       Width = 16
@@ -267,8 +267,8 @@ object DlgEventEdit: TDlgEventEdit
     object RecurrenceEndsLbl: TLabel
       Left = 352
       Height = 13
-      Top = 131
-      Width = 92
+      Top = 135
+      Width = 80
       Alignment = taRightJustify
       AutoSize = False
       Caption = 'Until:'
@@ -276,66 +276,67 @@ object DlgEventEdit: TDlgEventEdit
     end
     object DescriptionEdit: TEdit
       Left = 86
-      Height = 21
-      Top = 21
+      Height = 22
+      Top = 11
       Width = 580
       Anchors = [akTop, akLeft, akRight]
       TabOrder = 0
       Text = 'DescriptionEdit'
     end
     object AlarmSet: TCheckBox
-      Left = 40
+      Left = 38
       Height = 19
       Top = 170
       Width = 68
       Caption = '&Reminder:'
       OnClick = AlarmSetClick
-      TabOrder = 3
+      TabOrder = 11
     end
     object StartTime: TComboBox
       Left = 231
-      Height = 21
-      Top = 103
+      Height = 22
+      Top = 104
       Width = 93
-      ItemHeight = 13
+      ItemHeight = 14
       OnChangeBounds = StartTimeChange
       OnExit = StartTimeExit
       TabOrder = 4
     end
     object EndTime: TComboBox
       Left = 231
-      Height = 21
-      Top = 127
+      Height = 22
+      Top = 131
       Width = 93
-      ItemHeight = 13
+      ItemHeight = 14
       OnChangeBounds = EndTimeChange
       OnExit = EndTimeExit
-      TabOrder = 5
+      TabOrder = 6
     end
     object Category: TComboBox
       Left = 86
-      Height = 19
-      Top = 46
+      Height = 21
+      Top = 38
       Width = 182
-      ItemHeight = 13
+      ItemHeight = 15
       OnDrawItem = CategoryDrawItem
+      ReadOnly = True
       Style = csOwnerDrawFixed
       TabOrder = 1
     end
     object RecurringType: TComboBox
       Left = 379
-      Height = 21
-      Top = 103
-      Width = 183
-      ItemHeight = 13
+      Height = 22
+      Top = 104
+      Width = 187
+      ItemHeight = 14
       OnChange = RecurringTypeChange
       Style = csDropDownList
-      TabOrder = 6
+      TabOrder = 7
     end
     object IntervalUpDown: TUpDown
       Left = 654
-      Height = 29
-      Top = 99
+      Height = 24
+      Top = 103
       Width = 19
       Max = 32767
       Min = 0
@@ -345,30 +346,30 @@ object DlgEventEdit: TDlgEventEdit
       Wrap = False
     end
     object AlarmAdvType: TComboBox
-      Left = 230
-      Height = 21
-      Top = 168
-      Width = 88
-      ItemHeight = 13
+      Left = 231
+      Height = 22
+      Top = 167
+      Width = 93
+      ItemHeight = 14
       Style = csDropDownList
-      TabOrder = 8
+      TabOrder = 14
     end
     object AdvanceUpDown: TUpDown
       Left = 196
-      Height = 29
-      Top = 164
+      Height = 24
+      Top = 167
       Width = 19
       Max = 120
       Min = 1
       OnClick = AdvanceUpDownClick
       Position = 1
-      TabOrder = 10
+      TabOrder = 13
       Wrap = False
     end
     object CBAllDay: TCheckBox
-      Left = 109
+      Left = 104
       Height = 19
-      Top = 85
+      Top = 80
       Width = 84
       Caption = 'All Day Event'
       OnClick = CBAllDayClick
@@ -376,18 +377,18 @@ object DlgEventEdit: TDlgEventEdit
     end
     object edtUnusedPlaceholder: TEdit
       Left = 587
-      Height = 21
-      Top = 103
+      Height = 22
+      Top = 104
       Width = 65
-      TabOrder = 7
+      TabOrder = 8
       Text = 'Placeholder control'
       Visible = False
     end
     object StartDate: TDateEdit
-      Left = 117
-      Height = 21
+      Left = 104
+      Height = 22
       Top = 104
-      Width = 80
+      Width = 104
       CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
       OKCaption = 'OK'
       CancelCaption = 'Cancel'
@@ -432,13 +433,13 @@ object DlgEventEdit: TDlgEventEdit
       NumGlyphs = 1
       MaxLength = 0
       OnChangeBounds = StartDateChange
-      TabOrder = 11
+      TabOrder = 3
     end
     object EndDate: TDateEdit
-      Left = 117
-      Height = 21
+      Left = 104
+      Height = 22
       Top = 131
-      Width = 80
+      Width = 104
       CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
       OKCaption = 'OK'
       CancelCaption = 'Cancel'
@@ -483,13 +484,13 @@ object DlgEventEdit: TDlgEventEdit
       NumGlyphs = 1
       MaxLength = 0
       OnChangeBounds = EndDateChange
-      TabOrder = 12
+      TabOrder = 5
     end
     object RepeatUntil: TDateEdit
-      Left = 460
-      Height = 21
-      Top = 129
-      Width = 80
+      Left = 440
+      Height = 22
+      Top = 131
+      Width = 100
       CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
       OKCaption = 'OK'
       CancelCaption = 'Cancel'
@@ -533,29 +534,29 @@ object DlgEventEdit: TDlgEventEdit
       }
       NumGlyphs = 1
       MaxLength = 0
-      TabOrder = 13
+      TabOrder = 10
     end
     object AlarmAdvance: TEdit
       Left = 130
-      Height = 21
+      Height = 22
       Top = 168
       Width = 64
       OnChange = AlarmAdvanceChange
-      TabOrder = 14
+      TabOrder = 12
       Text = 'AlarmAdvance'
     end
   end
   object NotesMemo: TMemo
     Left = 8
-    Height = 110
-    Top = 224
+    Height = 102
+    Top = 232
     Width = 679
     Anchors = [akTop, akLeft, akRight, akBottom]
     ScrollBars = ssVertical
-    TabOrder = 2
+    TabOrder = 1
   end
   object FileDialog: TOpenDialog
-    left = 356
-    top = 199
+    left = 320
+    top = 256
   end
 end
diff --git a/components/tvplanit/source/vpreseditdlg.lfm b/components/tvplanit/source/vpreseditdlg.lfm
index e53b695bb..ebaa06f51 100644
--- a/components/tvplanit/source/vpreseditdlg.lfm
+++ b/components/tvplanit/source/vpreseditdlg.lfm
@@ -11,10 +11,12 @@ object ResEditForm: TResEditForm
   Constraints.MinHeight = 250
   Constraints.MinWidth = 400
   Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  Font.Name = 'Default'
   OnCreate = FormCreate
   OnShow = FormShow
+  LCLVersion = '1.7'
   object pnlBottom: TPanel
+    Left = 0
     Height = 41
     Top = 209
     Width = 400
@@ -22,9 +24,9 @@ object ResEditForm: TResEditForm
     BevelOuter = bvNone
     ClientHeight = 41
     ClientWidth = 400
-    TabOrder = 0
+    TabOrder = 1
     object OKBtn: TButton
-      Left = 243
+      Left = 236
       Height = 25
       Top = 7
       Width = 75
@@ -36,7 +38,7 @@ object ResEditForm: TResEditForm
       TabStop = False
     end
     object CancelBtn: TButton
-      Left = 322
+      Left = 315
       Height = 25
       Top = 7
       Width = 75
@@ -49,37 +51,39 @@ object ResEditForm: TResEditForm
     end
   end
   object pgResource: TPageControl
+    Left = 0
     Height = 209
+    Top = 0
     Width = 400
     TabStop = False
     ActivePage = tabResource
     Align = alClient
     TabIndex = 0
-    TabOrder = 1
+    TabOrder = 0
     object tabResource: TTabSheet
       Caption = 'Resource'
-      ClientHeight = 183
+      ClientHeight = 182
       ClientWidth = 392
       object lblDescription: TLabel
         Left = 8
-        Height = 15
+        Height = 14
         Top = 24
-        Width = 77
+        Width = 57
         Caption = 'Description:'
         ParentColor = False
       end
       object lblNotes: TLabel
         Left = 8
-        Height = 15
+        Height = 14
         Top = 47
-        Width = 43
+        Width = 31
         Caption = 'Notes:'
         ParentColor = False
       end
       object imgResources: TImage
-        Left = 344
+        Left = 350
         Height = 32
-        Top = 16
+        Top = 15
         Width = 32
         Anchors = [akTop]
         AutoSize = True
@@ -106,13 +110,13 @@ object ResEditForm: TResEditForm
           3333333330F87703333330F87703333333333333330005333333330000333333
           3333
         }
-        Transparent = False
+        Transparent = True
       end
       object DescriptionEdit: TEdit
         Left = 80
-        Height = 21
+        Height = 22
         Top = 20
-        Width = 249
+        Width = 257
         Anchors = [akTop, akLeft, akRight]
         MaxLength = 255
         OnChange = Change
@@ -120,9 +124,9 @@ object ResEditForm: TResEditForm
       end
       object NotesMemo: TMemo
         Left = 8
-        Height = 84
+        Height = 103
         Top = 67
-        Width = 369
+        Width = 374
         Anchors = [akTop, akLeft, akRight, akBottom]
         MaxLength = 1024
         OnChange = Change