diff --git a/components/tvplanit/packages/laz_visualplanit.lpk b/components/tvplanit/packages/laz_visualplanit.lpk
index 1b19a2413..522ae0a12 100644
--- a/components/tvplanit/packages/laz_visualplanit.lpk
+++ b/components/tvplanit/packages/laz_visualplanit.lpk
@@ -4,6 +4,7 @@
     <Name Value="laz_visualplanit"/>
     <Type Value="RunAndDesignTime"/>
     <AddToProjectUsesSection Value="True"/>
+    <Author Value="Original author: TurboPower Software"/>
     <CompilerOptions>
       <Version Value="11"/>
       <SearchPaths>
@@ -19,8 +20,19 @@
       </Parsing>
     </CompilerOptions>
     <Description Value="Lazarus Port of Turbo Power's VisualPlanIt components (designtime package)"/>
+    <License Value="The contents of these files are subject to the Mozilla Public License  Version 1.1 (the &quot;License&quot;); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/.
+
+Software distributed under the License is distributed on an &quot;AS IS&quot; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.   
+
+The Original Code is TurboPower Visual PlanIt.
+
+The Initial Developer of the Original Code is TurboPower Software.
+
+Portions created by TurboPower Software Inc. are Copyright (C) 2002 TurboPower Software Inc. All Rights Reserved. 
+
+Contributor(s): "/>
     <Version Major="1" Release="4"/>
-    <Files Count="2">
+    <Files Count="6">
       <Item1>
         <Filename Value="../source/vpabout.pas"/>
         <UnitName Value="VpAbout"/>
@@ -30,6 +42,22 @@
         <HasRegisterProc Value="True"/>
         <UnitName Value="VpReg"/>
       </Item2>
+      <Item3>
+        <Filename Value="../source/vpflxdsed1.lfm"/>
+        <Type Value="LFM"/>
+      </Item3>
+      <Item4>
+        <Filename Value="../source/vpflxdsed1.pas"/>
+        <UnitName Value="VpFlxDsEd1"/>
+      </Item4>
+      <Item5>
+        <Filename Value="../source/vpnabed.lfm"/>
+        <Type Value="LFM"/>
+      </Item5>
+      <Item6>
+        <Filename Value="../source/vpnabed.pas"/>
+        <UnitName Value="VpNabEd"/>
+      </Item6>
     </Files>
     <i18n>
       <EnableI18N Value="True"/>
diff --git a/components/tvplanit/packages/laz_visualplanit_runtime.lpk b/components/tvplanit/packages/laz_visualplanit_runtime.lpk
index 1fc8c5fdc..1d73768ad 100644
--- a/components/tvplanit/packages/laz_visualplanit_runtime.lpk
+++ b/components/tvplanit/packages/laz_visualplanit_runtime.lpk
@@ -3,6 +3,7 @@
   <Package Version="4">
     <Name Value="laz_visualplanit_runtime"/>
     <AddToProjectUsesSection Value="True"/>
+    <Author Value="Original author: TurboPower Software"/>
     <CompilerOptions>
       <Version Value="11"/>
       <SearchPaths>
@@ -18,8 +19,19 @@
       </Parsing>
     </CompilerOptions>
     <Description Value="Lazarus Port of Turbo Power's VisualPlanIt components (Runtime-Package)"/>
+    <License Value="The contents of these files are subject to the Mozilla Public License  Version 1.1 (the &quot;License&quot;); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/.
+
+Software distributed under the License is distributed on an &quot;AS IS&quot; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.   
+
+The Original Code is TurboPower Visual PlanIt.
+
+The Initial Developer of the Original Code is TurboPower Software.
+
+Portions created by TurboPower Software Inc. are Copyright (C) 2002 TurboPower Software Inc. All Rights Reserved. 
+
+Contributor(s): "/>
     <Version Major="1" Release="4"/>
-    <Files Count="62">
+    <Files Count="58">
       <Item1>
         <Filename Value="../source/vpalarmdlg.lfm"/>
         <Type Value="LFM"/>
@@ -149,125 +161,109 @@
         <UnitName Value="VpMonthView"/>
       </Item32>
       <Item33>
-        <Filename Value="../source/vpnabed.lfm"/>
-        <Type Value="LFM"/>
-      </Item33>
-      <Item34>
-        <Filename Value="../source/vpnabed.pas"/>
-        <UnitName Value="VpNabEd"/>
-      </Item34>
-      <Item35>
         <Filename Value="../source/vpnavbar.pas"/>
         <UnitName Value="VpNavBar"/>
-      </Item35>
-      <Item36>
+      </Item33>
+      <Item34>
         <Filename Value="../source/vpprtfmt.pas"/>
         <UnitName Value="VpPrtFmt"/>
-      </Item36>
-      <Item37>
+      </Item34>
+      <Item35>
         <Filename Value="../source/vpprtfmtcbox.pas"/>
         <UnitName Value="VpPrtFmtCBox"/>
-      </Item37>
-      <Item38>
+      </Item35>
+      <Item36>
         <Filename Value="../source/vpprtfmtdlg.pas"/>
         <UnitName Value="VpPrtFmtDlg"/>
-      </Item38>
-      <Item39>
+      </Item36>
+      <Item37>
         <Filename Value="../source/vpprtfmted.pas"/>
         <UnitName Value="VpPrtFmtEd"/>
-      </Item39>
-      <Item40>
+      </Item37>
+      <Item38>
         <Filename Value="../source/vpprtprv.pas"/>
         <UnitName Value="VpPrtPrv"/>
+      </Item38>
+      <Item39>
+        <Filename Value="../source/vpprtprvdlg.lfm"/>
+        <Type Value="LFM"/>
+      </Item39>
+      <Item40>
+        <Filename Value="../source/vpprtprvdlg.pas"/>
+        <UnitName Value="VpPrtPrvDlg"/>
       </Item40>
       <Item41>
-        <Filename Value="../source/vpprtprvdlg.lfm"/>
+        <Filename Value="../source/vpreseditdlg.lfm"/>
         <Type Value="LFM"/>
       </Item41>
       <Item42>
-        <Filename Value="../source/vpprtprvdlg.pas"/>
-        <UnitName Value="VpPrtPrvDlg"/>
+        <Filename Value="../source/vpreseditdlg.pas"/>
+        <UnitName Value="VpResEditDlg"/>
       </Item42>
       <Item43>
-        <Filename Value="../source/vpreseditdlg.lfm"/>
+        <Filename Value="../source/vpselresdlg.lfm"/>
         <Type Value="LFM"/>
       </Item43>
       <Item44>
-        <Filename Value="../source/vpreseditdlg.pas"/>
-        <UnitName Value="VpResEditDlg"/>
-      </Item44>
-      <Item45>
-        <Filename Value="../source/vpselresdlg.lfm"/>
-        <Type Value="LFM"/>
-      </Item45>
-      <Item46>
         <Filename Value="../source/vpselresdlg.pas"/>
         <UnitName Value="VpSelResDlg"/>
-      </Item46>
-      <Item47>
+      </Item44>
+      <Item45>
         <Filename Value="../source/vpsr.pas"/>
         <UnitName Value="VpSR"/>
-      </Item47>
-      <Item48>
+      </Item45>
+      <Item46>
         <Filename Value="../source/vptaskeditdlg.lfm"/>
         <Type Value="LFM"/>
-      </Item48>
-      <Item49>
+      </Item46>
+      <Item47>
         <Filename Value="../source/vptaskeditdlg.pas"/>
         <UnitName Value="VpTaskEditDlg"/>
-      </Item49>
-      <Item50>
+      </Item47>
+      <Item48>
         <Filename Value="../source/vptasklist.pas"/>
         <UnitName Value="VpTaskList"/>
-      </Item50>
-      <Item51>
+      </Item48>
+      <Item49>
         <Filename Value="../source/vptimerpool.pas"/>
         <UnitName Value="VpTimerPool"/>
-      </Item51>
-      <Item52>
+      </Item49>
+      <Item50>
         <Filename Value="../source/vpwavdlg.lfm"/>
         <Type Value="LFM"/>
-      </Item52>
-      <Item53>
+      </Item50>
+      <Item51>
         <Filename Value="../source/vpwavdlg.pas"/>
         <UnitName Value="VpWavDlg"/>
-      </Item53>
-      <Item54>
+      </Item51>
+      <Item52>
         <Filename Value="../source/vpwavpe.pas"/>
         <UnitName Value="VpWavPE"/>
-      </Item54>
-      <Item55>
+      </Item52>
+      <Item53>
         <Filename Value="../source/vpweekview.pas"/>
         <UnitName Value="VpWeekView"/>
-      </Item55>
-      <Item56>
+      </Item53>
+      <Item54>
         <Filename Value="../source/vpxbase.pas"/>
         <UnitName Value="VpXBase"/>
-      </Item56>
-      <Item57>
+      </Item54>
+      <Item55>
         <Filename Value="../source/vpxchrflt.pas"/>
         <UnitName Value="VpXChrFlt"/>
-      </Item57>
-      <Item58>
+      </Item55>
+      <Item56>
         <Filename Value="../source/vpxparsr.pas"/>
         <UnitName Value="VpXParsr"/>
-      </Item58>
-      <Item59>
+      </Item56>
+      <Item57>
         <Filename Value="../source/vpbase.res"/>
         <Type Value="Binary"/>
-      </Item59>
-      <Item60>
+      </Item57>
+      <Item58>
         <Filename Value="../source/vpflxds.pas"/>
         <UnitName Value="VpFlxDS"/>
-      </Item60>
-      <Item61>
-        <Filename Value="../source/vpflxdsed1.pas"/>
-        <UnitName Value="VpFlxDsEd1"/>
-      </Item61>
-      <Item62>
-        <Filename Value="../source/vpflxdsed1.lfm"/>
-        <Type Value="LFM"/>
-      </Item62>
+      </Item58>
     </Files>
     <i18n>
       <EnableI18N Value="True"/>
diff --git a/components/tvplanit/source/vpabout.lfm b/components/tvplanit/source/vpabout.lfm
index b12004911..13d498cc6 100644
--- a/components/tvplanit/source/vpabout.lfm
+++ b/components/tvplanit/source/vpabout.lfm
@@ -2,13 +2,13 @@ object frmAbout: TfrmAbout
   Left = 282
   Height = 312
   Top = 205
-  Width = 471
+  Width = 502
   HorzScrollBar.Page = 470
   VertScrollBar.Page = 311
   BorderStyle = bsDialog
   Caption = 'About Visual PlanIt'
   ClientHeight = 312
-  ClientWidth = 471
+  ClientWidth = 502
   OnActivate = FormActivate
   OnMouseMove = FormMouseMove
   Position = poScreenCenter
@@ -17,14 +17,14 @@ object frmAbout: TfrmAbout
     Left = 152
     Height = 96
     Top = 160
-    Width = 305
+    Width = 344
     Shape = bsFrame
   end
   object Bevel2: TBevel
     Left = 6
     Height = 17
     Top = 265
-    Width = 451
+    Width = 490
     Shape = bsTopLine
   end
   object ProgramName: TLabel
@@ -58,14 +58,11 @@ object frmAbout: TfrmAbout
   object lblTurboLink: TLabel
     Cursor = crHandPoint
     Left = 161
-    Height = 14
+    Height = 15
     Top = 125
-    Width = 193
+    Width = 222
     Caption = 'http://sourceforge.net/projects/tpvplanit/'
     Font.Color = clBlue
-    Font.Height = -11
-    Font.Name = 'Default'
-    Font.Style = [fsUnderline]
     ParentColor = False
     ParentFont = False
     OnClick = lblTurboLinkClick
@@ -74,14 +71,11 @@ object frmAbout: TfrmAbout
   object lblHelp: TLabel
     Cursor = crHandPoint
     Left = 168
-    Height = 14
+    Height = 15
     Top = 198
-    Width = 278
+    Width = 315
     Caption = 'http://sourceforge.net/forum/forum.php?forum_id=241880'
     Font.Color = clBlue
-    Font.Height = -11
-    Font.Name = 'Default'
-    Font.Style = [fsUnderline]
     ParentColor = False
     ParentFont = False
     OnClick = lblHelpClick
@@ -106,14 +100,11 @@ object frmAbout: TfrmAbout
   object lblGeneralDiscussion: TLabel
     Cursor = crHandPoint
     Left = 168
-    Height = 14
+    Height = 15
     Top = 230
-    Width = 278
+    Width = 315
     Caption = 'http://sourceforge.net/forum/forum.php?forum_id=241879'
     Font.Color = clBlue
-    Font.Height = -11
-    Font.Name = 'Default'
-    Font.Style = [fsUnderline]
     ParentColor = False
     ParentFont = False
     OnClick = lblGeneralDiscussionClick
@@ -137,9 +128,9 @@ object frmAbout: TfrmAbout
   end
   object Label1: TLabel
     Left = 152
-    Height = 49
+    Height = 58
     Top = 40
-    Width = 265
+    Width = 336
     AutoSize = False
     Caption = 'Visual PlanIt was released under the Mozilla 1.1 license in January, 2003. The project is hosted on SourceForge at sourceforge.net/projects/tpvplanit.'
     ParentColor = False
@@ -1289,7 +1280,7 @@ object frmAbout: TfrmAbout
     end
   end
   object OKButton: TButton
-    Left = 380
+    Left = 416
     Height = 25
     Top = 277
     Width = 75
diff --git a/components/tvplanit/source/vpconst.pas b/components/tvplanit/source/vpconst.pas
index c84b31607..a8404e532 100644
--- a/components/tvplanit/source/vpconst.pas
+++ b/components/tvplanit/source/vpconst.pas
@@ -47,8 +47,8 @@ uses
   Forms, StdCtrls;
 
 const
-  BuildTime = '09/13/2002 09:25 AM';
-  VpVersionStr = 'v1.03';    {Visual PlanIt library version}
+  BuildTime = {$I %DATE%} + {$I %TIME}; //'09/13/2002 09:25 AM';
+  VpVersionStr = 'v1.04';    {Visual PlanIt library version}
   VpProductName = 'Visual PlanIt';
 
   BorderStyles    : array[TBorderStyle] of LongInt =
diff --git a/components/tvplanit/source/vpflxdsed1.pas b/components/tvplanit/source/vpflxdsed1.pas
index c236620c0..65758d04d 100644
--- a/components/tvplanit/source/vpflxdsed1.pas
+++ b/components/tvplanit/source/vpflxdsed1.pas
@@ -246,7 +246,6 @@ var
   ErrorStr: string;
 begin
   ErrorStr := '';
-  btnAddMapping.Caption := 'Add Field'#13#10'Mapping';
 
   DSResActive := false;
   DSEventActive := false;
diff --git a/components/tvplanit/source/vpnabed.lfm b/components/tvplanit/source/vpnabed.lfm
index 6dda0718e..aa07f029c 100644
--- a/components/tvplanit/source/vpnabed.lfm
+++ b/components/tvplanit/source/vpnabed.lfm
@@ -1,12 +1,12 @@
 object frmNavBarEd: TfrmNavBarEd
   Left = 374
-  Height = 326
+  Height = 344
   Top = 236
   Width = 426
   HorzScrollBar.Page = 425
   VertScrollBar.Page = 322
   Caption = 'Nav Bar Layout Tool'
-  ClientHeight = 326
+  ClientHeight = 344
   ClientWidth = 426
   FormStyle = fsStayOnTop
   OnClose = FormClose
@@ -16,18 +16,19 @@ object frmNavBarEd: TfrmNavBarEd
   LCLVersion = '1.7'
   object pnlItems: TPanel
     Left = 217
-    Height = 224
+    Height = 226
     Top = 0
     Width = 209
     Align = alClient
-    ClientHeight = 224
+    BevelOuter = bvNone
+    ClientHeight = 226
     ClientWidth = 209
     TabOrder = 1
     object lbItems: TListBox
-      Left = 1
-      Height = 199
-      Top = 24
-      Width = 175
+      Left = 0
+      Height = 203
+      Top = 23
+      Width = 173
       Align = alClient
       ItemHeight = 13
       OnClick = lbItemsClick
@@ -36,13 +37,14 @@ object frmNavBarEd: TfrmNavBarEd
       TabOrder = 1
     end
     object Panel1: TPanel
-      Left = 176
-      Height = 199
-      Top = 24
+      Left = 173
+      Height = 203
+      Top = 23
       Width = 32
       Align = alRight
+      BorderSpacing.Right = 4
       BevelOuter = bvNone
-      ClientHeight = 199
+      ClientHeight = 203
       ClientWidth = 32
       TabOrder = 2
       object btnItemAdd: TSpeedButton
@@ -135,17 +137,17 @@ object frmNavBarEd: TfrmNavBarEd
       end
     end
     object Panel4: TPanel
-      Left = 1
+      Left = 0
       Height = 23
-      Top = 1
-      Width = 207
+      Top = 0
+      Width = 209
       Align = alTop
       BevelOuter = bvNone
       ClientHeight = 23
-      ClientWidth = 207
+      ClientWidth = 209
       TabOrder = 0
       object Label2: TLabel
-        Left = 4
+        Left = 0
         Height = 15
         Top = 4
         Width = 62
@@ -157,32 +159,34 @@ object frmNavBarEd: TfrmNavBarEd
   end
   object pnlFolders: TPanel
     Left = 0
-    Height = 224
+    Height = 226
     Top = 0
     Width = 217
     Align = alLeft
-    ClientHeight = 224
+    BevelOuter = bvNone
+    ClientHeight = 226
     ClientWidth = 217
     TabOrder = 0
     object lbFolders: TListBox
-      Left = 1
-      Height = 199
-      Top = 24
-      Width = 183
+      Left = 4
+      Height = 203
+      Top = 23
+      Width = 181
       Align = alClient
+      BorderSpacing.Left = 4
       ItemHeight = 0
       OnClick = lbFoldersClick
       TabOrder = 1
     end
     object Panel6: TPanel
-      Left = 1
+      Left = 0
       Height = 23
-      Top = 1
-      Width = 215
+      Top = 0
+      Width = 217
       Align = alTop
       BevelOuter = bvNone
       ClientHeight = 23
-      ClientWidth = 215
+      ClientWidth = 217
       TabOrder = 0
       object Label1: TLabel
         Left = 4
@@ -195,13 +199,13 @@ object frmNavBarEd: TfrmNavBarEd
       end
     end
     object Panel5: TPanel
-      Left = 184
-      Height = 199
-      Top = 24
+      Left = 185
+      Height = 203
+      Top = 23
       Width = 32
       Align = alRight
       BevelOuter = bvNone
-      ClientHeight = 199
+      ClientHeight = 203
       ClientWidth = 32
       TabOrder = 2
       object btnFolderAdd: TSpeedButton
@@ -296,25 +300,26 @@ object frmNavBarEd: TfrmNavBarEd
   end
   object pnlImages: TPanel
     Left = 0
-    Height = 102
-    Top = 224
+    Height = 118
+    Top = 226
     Width = 426
     Align = alBottom
-    ClientHeight = 102
+    BevelOuter = bvNone
+    ClientHeight = 118
     ClientWidth = 426
     TabOrder = 2
     object Panel8: TPanel
-      Left = 1
+      Left = 0
       Height = 27
-      Top = 1
-      Width = 424
+      Top = 0
+      Width = 426
       Align = alTop
       BevelOuter = bvNone
       ClientHeight = 27
-      ClientWidth = 424
+      ClientWidth = 426
       TabOrder = 0
       object Label3: TLabel
-        Left = 8
+        Left = 4
         Height = 15
         Top = 8
         Width = 89
@@ -323,11 +328,14 @@ object frmNavBarEd: TfrmNavBarEd
       end
     end
     object lbImages: TListBox
-      Left = 1
-      Height = 73
-      Top = 28
-      Width = 424
+      Left = 4
+      Height = 87
+      Top = 27
+      Width = 418
       Align = alClient
+      BorderSpacing.Left = 4
+      BorderSpacing.Right = 4
+      BorderSpacing.Bottom = 4
       Columns = 10
       ItemHeight = 16
       OnClick = lbImagesClick