diff --git a/components/tvplanit/examples/fulldemo/demomain.lfm b/components/tvplanit/examples/fulldemo/demomain.lfm
index eb552abc0..8c2bf320c 100644
--- a/components/tvplanit/examples/fulldemo/demomain.lfm
+++ b/components/tvplanit/examples/fulldemo/demomain.lfm
@@ -121,6 +121,8 @@ object MainForm: TMainForm
             DataStore = VpBufDSDataStore1
             ControlLink = VpControlLink1
             Color = clWindow
+            Font.Height = -12
+            ParentFont = False
             ParentShowHint = False
             Align = alClient
             ReadOnly = False
diff --git a/components/tvplanit/source/laz_visualplanit.lpk b/components/tvplanit/source/laz_visualplanit.lpk
index b38c27405..0bd83e4ac 100644
--- a/components/tvplanit/source/laz_visualplanit.lpk
+++ b/components/tvplanit/source/laz_visualplanit.lpk
@@ -30,7 +30,7 @@ Portions created by TurboPower Software Inc. are Copyright (C) 2002 TurboPower S
 
 Contributor(s): "/>
     <Version Major="1" Release="4"/>
-    <Files Count="76">
+    <Files Count="78">
       <Item1>
         <Filename Value="vpalarmdlg.lfm"/>
         <Type Value="LFM"/>
@@ -336,6 +336,14 @@ Contributor(s): "/>
         <Filename Value="vpfbds.pas"/>
         <UnitName Value="VpFBDS"/>
       </Item76>
+      <Item77>
+        <Filename Value="vpedfmtlst.lfm"/>
+        <Type Value="LFM"/>
+      </Item77>
+      <Item78>
+        <Filename Value="vpedfmtlst.pas"/>
+        <UnitName Value="VpEdFmtLst"/>
+      </Item78>
     </Files>
     <i18n>
       <EnableI18N Value="True"/>
diff --git a/components/tvplanit/source/vpabout.lfm b/components/tvplanit/source/vpabout.lfm
index c340355c2..e66b7ba8b 100644
--- a/components/tvplanit/source/vpabout.lfm
+++ b/components/tvplanit/source/vpabout.lfm
@@ -1,6 +1,6 @@
 object frmAbout: TfrmAbout
   Left = 282
-  Height = 488
+  Height = 313
   Top = 205
   Width = 582
   HorzScrollBar.Page = 470
@@ -8,7 +8,7 @@ object frmAbout: TfrmAbout
   AutoSize = True
   BorderStyle = bsDialog
   Caption = 'About Visual PlanIt'
-  ClientHeight = 488
+  ClientHeight = 313
   ClientWidth = 582
   OnActivate = FormActivate
   Position = poScreenCenter
diff --git a/components/tvplanit/source/vpcontacteditdlg.lfm b/components/tvplanit/source/vpcontacteditdlg.lfm
index cd7f61417..29173d97f 100644
--- a/components/tvplanit/source/vpcontacteditdlg.lfm
+++ b/components/tvplanit/source/vpcontacteditdlg.lfm
@@ -506,7 +506,6 @@ object ContactEditForm: TContactEditForm
       Default = True
       OnClick = OKBtnClick
       TabOrder = 0
-      TabStop = False
     end
     object CancelBtn: TButton
       Left = 351
@@ -518,7 +517,6 @@ object ContactEditForm: TContactEditForm
       Caption = 'Cancel'
       OnClick = CancelBtnClick
       TabOrder = 1
-      TabStop = False
     end
   end
 end
diff --git a/components/tvplanit/source/vpcontacteditdlg.pas b/components/tvplanit/source/vpcontacteditdlg.pas
index c3e477378..38e80b9c1 100644
--- a/components/tvplanit/source/vpcontacteditdlg.pas
+++ b/components/tvplanit/source/vpcontacteditdlg.pas
@@ -563,9 +563,14 @@ begin
 
   OKBtn.Width := Max(GetButtonWidth(OKBtn), GetButtonWidth(CancelBtn));
   CancelBtn.Width := OKBtn.Width;
+ {$IFDEF MSWINDOWS}   // button order: OK - Cancel
   CancelBtn.Left := pnlBottom.ClientWidth - HBorder - CancelBtn.Width;
   OKBtn.Left := CancelBtn.Left - Dist - OKBtn.Width;
-
+ {$ELSE}              // button order: Cancel - OK
+  OKBtn.Left := pnlBottom.ClientWidth - HBorder - OKBtn.Width;
+  CancelBtn.Left := OKBtn.Left - Dist - CancelBtn.Width;
+  OKBtn.TabOrder := 1;
+ {$ENDIF}
 end;
 
 procedure TContactEditForm.DisplayCurrentCountry;
diff --git a/components/tvplanit/source/vpedelem.lfm b/components/tvplanit/source/vpedelem.lfm
index aab2b26d0..00eeabe16 100644
--- a/components/tvplanit/source/vpedelem.lfm
+++ b/components/tvplanit/source/vpedelem.lfm
@@ -1,13 +1,13 @@
 object frmEditElement: TfrmEditElement
   Left = 1069
-  Height = 503
+  Height = 449
   Top = 231
   Width = 489
   HorzScrollBar.Page = 378
   VertScrollBar.Page = 444
   BorderStyle = bsDialog
   Caption = 'Edit Element'
-  ClientHeight = 503
+  ClientHeight = 449
   ClientWidth = 489
   OnCreate = FormCreate
   OnShow = FormShow
@@ -26,7 +26,7 @@ object frmEditElement: TfrmEditElement
     Caption = ' Visual '
     ClientHeight = 132
     ClientWidth = 461
-    TabOrder = 0
+    TabOrder = 3
     object rgMeasurement: TRadioGroup
       Left = 104
       Height = 124
@@ -251,7 +251,7 @@ object frmEditElement: TfrmEditElement
     Caption = ' Caption '
     ClientHeight = 34
     ClientWidth = 461
-    TabOrder = 1
+    TabOrder = 4
     object lblCaptionText: TLabel
       AnchorSideLeft.Control = gbCaption
       AnchorSideTop.Control = edCaptionText
@@ -312,7 +312,7 @@ object frmEditElement: TfrmEditElement
     BevelOuter = bvNone
     ClientHeight = 23
     ClientWidth = 465
-    TabOrder = 2
+    TabOrder = 0
     object lblName: TLabel
       AnchorSideTop.Control = edName
       AnchorSideTop.Side = asrCenter
@@ -349,7 +349,7 @@ object frmEditElement: TfrmEditElement
     BevelOuter = bvNone
     ClientHeight = 56
     ClientWidth = 467
-    TabOrder = 3
+    TabOrder = 2
     object gbDayOffset: TGroupBox
       Left = 0
       Height = 56
@@ -431,7 +431,7 @@ object frmEditElement: TfrmEditElement
     BevelOuter = bvNone
     ClientHeight = 25
     ClientWidth = 465
-    TabOrder = 4
+    TabOrder = 5
     object btnShape: TButton
       AnchorSideLeft.Control = ButtonPanel
       Left = 0
@@ -483,7 +483,7 @@ object frmEditElement: TfrmEditElement
     BevelOuter = bvNone
     ClientHeight = 70
     ClientWidth = 467
-    TabOrder = 5
+    TabOrder = 1
     object rgItemType: TRadioGroup
       Left = 0
       Height = 70
diff --git a/components/tvplanit/source/vpedelem.pas b/components/tvplanit/source/vpedelem.pas
index 0bb85ea95..05fd46611 100644
--- a/components/tvplanit/source/vpedelem.pas
+++ b/components/tvplanit/source/vpedelem.pas
@@ -361,6 +361,19 @@ begin
   btnOK.Width := w;
   btnCancel.Width := w;
   btnShape.Width := GetButtonWidth(btnShape);
+ {$IFDEF MSWINDOWS}
+  btnOK.AnchorSideRight.Control := btnCancel;
+  btnOK.TabOrder := 1;
+  btnCancel.AnchorSideRight.Control := ButtonPanel;
+  btnCancel.AnchorSideRight.Side := asrBottom;
+  btnCancel.TabOrder := 2;
+ {$ELSE}
+  btnCancel.AnchorSideRight.Control := ButtonPanel;
+  btnCancel.TabOrder := 1;
+  btnOK.AnchorSideRight.Control := ButtonPanel;
+  btnOK.AnchorSideRight.Side := asrBottom;
+  btnOK.TabOrder := 2;
+ {$ENDIF}
 
   // Form size
   rgItemType.Align := alNone;
diff --git a/components/tvplanit/source/vpedfmt.lfm b/components/tvplanit/source/vpedfmt.lfm
index 20bd761b5..c4e10a199 100644
--- a/components/tvplanit/source/vpedfmt.lfm
+++ b/components/tvplanit/source/vpedfmt.lfm
@@ -86,6 +86,7 @@ object frmEditFormat: TfrmEditFormat
       'Year'
     )
     TabOrder = 4
+    TabStop = True
   end
   object edDescription: TEdit
     Left = 88
diff --git a/components/tvplanit/source/vpedfmt.pas b/components/tvplanit/source/vpedfmt.pas
index 1b2e9f2be..fb9f38d29 100644
--- a/components/tvplanit/source/vpedfmt.pas
+++ b/components/tvplanit/source/vpedfmt.pas
@@ -195,8 +195,17 @@ begin
   w := Max(GetButtonWidth(btnOK), GetButtonWidth(btnCancel));
   btnOK.Width := w;
   btnCancel.Width := w;
+ {$IFDEF MSWINDOWS}
   btnCancel.Left := RightOf(rgDayIncrement) - btnCancel.Width;
   btnOK.Left := btnCancel.Left - DELTA - btnOK.Width;
+  btnOK.TabOrder := rgDayIncrement.TabOrder + 1;
+  btnCancel.TabOrder := btnOK.TabOrder + 1;
+ {$ELSE}
+  btnOK.Left := RightOf(rgDayIncrement) - btnOK.Width;
+  btnCancel.Left := btnOK.Left - DELTA - btnCancel.Width;
+  btnCancel.TabOrder := rgDayIncrement.TabOrder + 1;
+  btnOK.TabOrder := btnCancel.TabOrder + 1;
+ {$ENDIF}
 
   edName.Height := editHeight;
   edDescription.Height := editHeight;
diff --git a/components/tvplanit/source/vpedfmtlst.lfm b/components/tvplanit/source/vpedfmtlst.lfm
index 36d716828..2d2bcccd3 100644
--- a/components/tvplanit/source/vpedfmtlst.lfm
+++ b/components/tvplanit/source/vpedfmtlst.lfm
@@ -5,6 +5,7 @@ object frmPrnFormat: TfrmPrnFormat
   Width = 694
   HorzScrollBar.Page = 639
   VertScrollBar.Page = 479
+  ActiveControl = lbFormats
   Caption = 'Print Format Designer'
   ClientHeight = 471
   ClientWidth = 694
@@ -113,7 +114,6 @@ object frmPrnFormat: TfrmPrnFormat
       EndDate = 37377.6447728357
       StartDate = 37370.6447728357
       Parent = PrintPreviewPanel
-      TabStop = True
       TabOrder = 0
     end
     object LblPrintPreview: TLabel
diff --git a/components/tvplanit/source/vpedshape.pas b/components/tvplanit/source/vpedshape.pas
index f62a4a4e0..74c19f48b 100644
--- a/components/tvplanit/source/vpedshape.pas
+++ b/components/tvplanit/source/vpedshape.pas
@@ -411,8 +411,17 @@ begin
     cbBrushColor.Width := cbBrushColor.Width + btnOK.Width + DELTA + btnCancel.Width - gbBrush.Width;
     cbBrushStyle.Width := cbBrushColor.Width;
   end;
+ {$IFDEF MSWINDOWS}
   btnCancel.Left := RightOf(gbBrush) - btnCancel.Width;
   btnOK.Left := btnCancel.Left - DELTA - btnOK.Width;
+  btnOK.TabOrder := gbBrush.TabOrder + 1;
+  btnCancel.TabOrder := btnOK.TabOrder + 1;
+ {$ELSE}
+  btnOK.Left := RightOf(gbBrush) - btnOK.Width;
+  btnCancel.Left := btnOK.Left - DELTA - btnCancel.Width;
+  btnCancel.TabOrder := gbBrush.TabOrder + 1;
+  btnOK.TabOrder := btnCancel.TabOrder + 1;
+ {$ENDIF}
 
   { Buttons - vert }
   btnOK.Height := hb;
diff --git a/components/tvplanit/source/vpevnteditdlg.lfm b/components/tvplanit/source/vpevnteditdlg.lfm
index 583f0e48a..ffc240f8f 100644
--- a/components/tvplanit/source/vpevnteditdlg.lfm
+++ b/components/tvplanit/source/vpevnteditdlg.lfm
@@ -22,7 +22,7 @@ object DlgEventEdit: TDlgEventEdit
     BevelOuter = bvNone
     ClientHeight = 36
     ClientWidth = 697
-    TabOrder = 0
+    TabOrder = 1
     object ResourceNameLbl: TLabel
       Left = 8
       Height = 16
@@ -47,7 +47,6 @@ object DlgEventEdit: TDlgEventEdit
       Default = True
       OnClick = OKBtnClick
       TabOrder = 0
-      TabStop = False
     end
     object CancelBtn: TButton
       Left = 608
@@ -59,7 +58,6 @@ object DlgEventEdit: TDlgEventEdit
       Caption = '&Cancel'
       OnClick = CancelBtnClick
       TabOrder = 1
-      TabStop = False
     end
   end
   object Panel1: TPanel
@@ -72,7 +70,7 @@ object DlgEventEdit: TDlgEventEdit
     BorderWidth = 8
     ClientHeight = 397
     ClientWidth = 697
-    TabOrder = 1
+    TabOrder = 0
     object AppointmentGroupBox: TGroupBox
       Left = 8
       Height = 215
diff --git a/components/tvplanit/source/vpevnteditdlg.pas b/components/tvplanit/source/vpevnteditdlg.pas
index b547ffdc6..ca4c0693c 100644
--- a/components/tvplanit/source/vpevnteditdlg.pas
+++ b/components/tvplanit/source/vpevnteditdlg.pas
@@ -782,8 +782,17 @@ begin
 
   OKBtn.Width := Max(GetButtonWidth(OKBtn), GetButtonWidth(CancelBtn));
   CancelBtn.Width := OKBtn.Width;
+ {$IFDEF MSWINDOWS}
   CancelBtn.Left := ButtonPanel.ClientWidth - ResourcenameLbl.Left - CancelBtn.Width;
   OKBtn.Left := CancelBtn.Left - DELTA - OKBtn.Width;
+  OKBtn.TabOrder := 0;
+  CancelBtn.TabOrder := 1;
+ {$ELSE}
+  OKBtn.Left := ButtonPanel.ClientWidth - ResourcenameLbl.Left - OKBtn.Width;
+  CancelBtn.Left := OKBtn.Left - DELTA - CancelBtn.Width;
+  CancelBtn.TabOrder := 0;
+  OKBtn.TabOrder := 1;
+ {$ENDIF}
   ResourceNameLbl.Font.Size := ScaleY(ResourceNameLbl.Font.Size, DesignTimeDPI);
   ResourceNameLbl.Top := (ButtonPanel.ClientHeight - Panel1.BorderWidth - ResourceNameLbl.Height) div 2;
   OKBtn.Top := (ButtonPanel.ClientHeight - Panel1.BorderWidth - OKBtn.Height) div 2;
diff --git a/components/tvplanit/source/vpflxdsed1.pas b/components/tvplanit/source/vpflxdsed1.pas
index 8e679892b..b455d09e8 100644
--- a/components/tvplanit/source/vpflxdsed1.pas
+++ b/components/tvplanit/source/vpflxdsed1.pas
@@ -360,8 +360,17 @@ begin
     lblFieldMappings.Left := FieldMappingsLB.Left;
     btnDeleteMapping.Left := ClientWidth - DatasetFieldLB.Left - btnDeleteMapping.Width;
     btnClearMappings.Left := btnDeleteMapping.Left;
+   {$IFDEF MSWINDOWS}
     BtnCancel.Left := w - DatasetFieldLB.Width - BtnCancel.Width;
     BtnOK.Left := BtnCancel.Left - DELTA - BtnOK.Width;
+    BtnOK.TabOrder := 0;
+    BtnCancel.TabOrder := 1;
+   {$ELSE}
+    BtnOK.Left := w - DatasetFieldLB.Width - BtnOK.Width;
+    BtnCancel.Left := BtnOK.Left - DELTA - BtnCancel.Width;
+    BtnCancel.TabOrder := 0;
+    BtnOK.TabOrder := 1;
+   {$ENDIF}
   end;
   lblVPFieldsAvail.Left := RightOf(VPFieldLB) - GetLabelWidth(lblVPFieldsAvail);
 end;
diff --git a/components/tvplanit/source/vpreseditdlg.pas b/components/tvplanit/source/vpreseditdlg.pas
index 0fe2bef5c..848220bdf 100644
--- a/components/tvplanit/source/vpreseditdlg.pas
+++ b/components/tvplanit/source/vpreseditdlg.pas
@@ -240,8 +240,17 @@ begin
 
   OKBtn.Width := Max(GetButtonWidth(OKBtn), GetButtonWidth(CancelBtn));
   CancelBtn.Width := OKBtn.Width;
+ {$IFDEF MSWINDOWS}
   CancelBtn.Left := pnlBottom.ClientWidth - lblDescription.Left - CancelBtn.Width;
   OKBtn.Left := CancelBtn.Left - OKBtn.Width - HDelta; // - (ClientWidth - tabResource.ClientWidth);
+  OKBtn.TabOrder := 0;
+  CancelBtn.TabOrder := 1;
+ {$ELSE}
+  OKBtn.Left := pnlBottom.ClientWidth - lblDescription.Left - OKBtn.Width;
+  CancelBtn.Left := OKBtn.Left - CancelBtn.Width - HDelta; // - (ClientWidth - tabResource.ClientWidth);
+  CancelBtn.TabOrder := 0;
+  OKBtn.TabOrder := 1;
+ {$ENDIF}
 end;
 
 procedure TResEditForm.OKBtnClick(Sender: TObject);
diff --git a/components/tvplanit/source/vptaskeditdlg.pas b/components/tvplanit/source/vptaskeditdlg.pas
index 60de02da1..a908c81e4 100644
--- a/components/tvplanit/source/vptaskeditdlg.pas
+++ b/components/tvplanit/source/vptaskeditdlg.pas
@@ -209,8 +209,17 @@ begin
 
   OKBtn.Width := Max(GetButtonWidth(OKBtn), GetButtonWidth(CancelBtn));
   CancelBtn.Width := OKBtn.Width;
+ {$IFDEF MSWINDOWS}
   CancelBtn.Left := ButtonPanel.ClientWidth - ResourcenameLbl.Left - CancelBtn.Width;
   OKBtn.Left := CancelBtn.Left - HDist - OKBtn.Width;
+  OKBtn.TabOrder := 0;
+  CancelBtn.TabOrder := 1;
+ {$ELSE}
+  OKBtn.Left := ButtonPanel.ClientWidth - ResourcenameLbl.Left - OKBtn.Width;
+  CancelBtn.Left := OKBtn.Left - HDist - CancelBtn.Width;
+  CancelBtn.TabOrder := 0;
+  OKBtn.TabOrder := 1;
+ {$ENDIF}
 
   Bevel1.Top := DescriptionEdit.Top + editHeight + VBevelDist; //BottomOf(DescriptionEdit) + VBevelDist;
 
diff --git a/components/tvplanit/source/vpwavdlg.lfm b/components/tvplanit/source/vpwavdlg.lfm
index 8d9d2a99a..81c6dbac9 100644
--- a/components/tvplanit/source/vpwavdlg.lfm
+++ b/components/tvplanit/source/vpwavdlg.lfm
@@ -35,7 +35,7 @@ object FrmSoundDialog: TFrmSoundDialog
         BevelOuter = bvNone
         ClientHeight = 446
         ClientWidth = 519
-        TabOrder = 1
+        TabOrder = 2
         object Panel1: TPanel
           Left = 0
           Height = 27
@@ -178,7 +178,7 @@ object FrmSoundDialog: TFrmSoundDialog
         ClientHeight = 434
         ClientWidth = 196
         Constraints.MinWidth = 200
-        TabOrder = 2
+        TabOrder = 0
         object ShellTreeView: TShellTreeView
           Left = 4
           Height = 306
diff --git a/components/tvplanit/source/vpwavdlg.pas b/components/tvplanit/source/vpwavdlg.pas
index 57d6c66c1..8bba01f10 100644
--- a/components/tvplanit/source/vpwavdlg.pas
+++ b/components/tvplanit/source/vpwavdlg.pas
@@ -185,9 +185,17 @@ begin
 
   OKBtn.Width := Max(GetButtonWidth(OKBtn), GetButtonWidth(CancelBtn));
   CancelBtn.Width := OKBtn.Width;
+ {$IFDEF MSWINDOWS}
   CancelBtn.Left := ButtonPanel.ClientWidth - HBORDER - CancelBtn.Width;
   OKBtn.Left := CancelBtn.Left - DIST - OKBtn.Width;
-
+  OKBtn.TabOrder := 0;
+  CancelBtn.TabOrder := 1;
+ {$ELSE}
+  OKBtn.Left := ButtonPanel.ClientWidth - HBORDER - OKBtn.Width;
+  CancelBtn.Left := OKBtn.Left - DIST - CancelBtn.Width;
+  CancelBtn.TabOrder := 0;
+  OKBtn.TabOrder := 1;
+ {$ENDIF}
   if DingPath = '' then begin
     CBDefault.Checked := true;
     if (MediaFolder <> '') and DirectoryExists(MediaFolder) then