diff --git a/components/tvplanit/packages/v103_lazarus.lpk b/components/tvplanit/packages/v103_lazarus.lpk
index 96801a7ff..d53d71804 100644
--- a/components/tvplanit/packages/v103_lazarus.lpk
+++ b/components/tvplanit/packages/v103_lazarus.lpk
@@ -1,22 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="3">
+  <Package Version="4">
     <Name Value="v103_lazarus"/>
+    <Type Value="RunAndDesignTime"/>
+    <AddToProjectUsesSection Value="True"/>
     <CompilerOptions>
-      <Version Value="5"/>
+      <Version Value="11"/>
       <SearchPaths>
-        <IncludeFiles Value="../source/"/>
-        <OtherUnitFiles Value="../source/"/>
+        <IncludeFiles Value="../source"/>
+        <OtherUnitFiles Value="../source"/>
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
-      <CodeGeneration>
-        <Generate Value="Faster"/>
-      </CodeGeneration>
-      <Other>
-        <CompilerPath Value="$(CompPath)"/>
-      </Other>
+      <Parsing>
+        <SyntaxOptions>
+          <UseAnsiStrings Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
     </CompilerOptions>
-    <Files Count="60">
+    <Files Count="61">
       <Item1>
         <Filename Value="../source/vpabout.pas"/>
         <UnitName Value="VpAbout"/>
@@ -258,8 +259,11 @@
         <Filename Value="../source/vpxparsr.pas"/>
         <UnitName Value="VpXParsr"/>
       </Item60>
+      <Item61>
+        <Filename Value="../source/vpbase.res"/>
+        <Type Value="Binary"/>
+      </Item61>
     </Files>
-    <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="3">
       <Item1>
         <PackageName Value="FCL"/>
diff --git a/components/tvplanit/source/vpalarmdlg.pas b/components/tvplanit/source/vpalarmdlg.pas
index 35097f16d..288695ccb 100644
--- a/components/tvplanit/source/vpalarmdlg.pas
+++ b/components/tvplanit/source/vpalarmdlg.pas
@@ -282,11 +282,13 @@ begin
   Self.Height := 210;
   OpenItemBtn.SetFocus;
 end;
-
+      (*
 initialization
+
 {$IFDEF LCL}
   {$I vpalarmdlg.lrs}
 {$ENDIF}
+*)
 
 end.
  
diff --git a/components/tvplanit/source/vpbase.pas b/components/tvplanit/source/vpbase.pas
index 18fa36e7e..47b88a468 100644
--- a/components/tvplanit/source/vpbase.pas
+++ b/components/tvplanit/source/vpbase.pas
@@ -384,6 +384,8 @@ type
 
 implementation
 
+{$R vpbase.res}
+
 uses
   Math
   {$IFNDEF LCL}
@@ -959,11 +961,13 @@ begin
   end;
 end;
 {=====}
-
+                             (*
 //soenr ich habe das hinzugefügt
 {$IFDEF FPC}
 initialization
-  {$i vpbase.lrs}
+  {$i ../source/vpbase.lrs}
 {$ENDIF}
+*)
+
 end.
 
diff --git a/components/tvplanit/source/vpbase.res b/components/tvplanit/source/vpbase.res
index 54943719e..36b3c9a27 100644
Binary files a/components/tvplanit/source/vpbase.res and b/components/tvplanit/source/vpbase.res differ
diff --git a/components/tvplanit/source/vpcalendar.pas b/components/tvplanit/source/vpcalendar.pas
index 8033a0448..09a75125c 100644
--- a/components/tvplanit/source/vpcalendar.pas
+++ b/components/tvplanit/source/vpcalendar.pas
@@ -35,7 +35,7 @@ interface
 
 uses
   {$IFDEF LCL}
-  LMessages,LCLProc,LCLType,LCLIntf,
+  LMessages,LCLProc,LCLType,LCLIntf,LazUTF8,
   {$ELSE}
   Windows,
   {$ENDIF}
@@ -1537,6 +1537,9 @@ var
         S := FormatDateTime('mmm yyyy', RenderDate)
       else
         S := FormatDateTime('mmm', RenderDate);
+   {$IF FPC_FULLVERSION < 30000}
+    S := SysToUTF8(S);
+   {$ENDIF}
 
     R := Rect (clRowCol[0, 1].Left + RealLeft,
                clRowCol[0, 1].Top + RealTop,
@@ -1547,7 +1550,11 @@ var
     {switch to short date format if string won't fit}
     if FDateFormat = dfLong then
       if RenderCanvas.TextWidth(S) > R.Right-R.Left then
+        {$IF FPC_FULLVERSION >= 30000}
         S := FormatDateTime('mmm yyyy', RenderDate);
+        {$ELSE}
+        S := SysToUTF8(FormatDateTime('mmm yyyy', RenderDate));
+        {$ENDIF}
 
     RenderCanvas.Font.Color := MonthYearColor;
     if Assigned(FOnDrawDate) then
@@ -1587,6 +1594,9 @@ var
         else
           S := Copy(LongDayNames[Ord(DOW)+1], 1, FDayNameWidth)
       end;
+     {$IF FPC_FULLVERSION < 30000}
+      S := SysToUTF8(S);
+     {$ENDIF}
 
       {draw the day name above each column}
       DrawRect := Rect (clRowCol[1, I].Left + RealLeft,
diff --git a/components/tvplanit/source/vpcontacteditdlg.pas b/components/tvplanit/source/vpcontacteditdlg.pas
index 83f5dffb2..7c2aecc11 100644
--- a/components/tvplanit/source/vpcontacteditdlg.pas
+++ b/components/tvplanit/source/vpcontacteditdlg.pas
@@ -667,11 +667,12 @@ begin
     NameEdit.SetFocus;
 end;
 {=====}
-
+               (*
 initialization
 {$IFDEF LCL}
   {$I vpcontacteditdlg.lrs}
 {$ENDIF}
+                 *)
 
 end.
 
diff --git a/components/tvplanit/source/vpevnteditdlg.pas b/components/tvplanit/source/vpevnteditdlg.pas
index 30856454d..b8cb66b3d 100644
--- a/components/tvplanit/source/vpevnteditdlg.pas
+++ b/components/tvplanit/source/vpevnteditdlg.pas
@@ -724,9 +724,9 @@ begin
   StartTime.Text := FormatDateTime('hh:mm',ET- (30/MinutesInDay));
   end;
 end;                                                                     
-
+           (*
 initialization
   {$I vpevnteditdlg.lrs}
-
+             *)
 end.
  
diff --git a/components/tvplanit/source/vpmonthview.pas b/components/tvplanit/source/vpmonthview.pas
index 6c95b160c..788dfd512 100644
--- a/components/tvplanit/source/vpmonthview.pas
+++ b/components/tvplanit/source/vpmonthview.pas
@@ -580,7 +580,11 @@ var
     end;
 
     { Acquire startdate and end date }
+    {$IF FPC_FULLVERSION >= 30000}
+    HeadStr := FormatDateTime(DateLabelFormat, DisplayDate);
+    {$ELSE}
     HeadStr := SysToUTF8(FormatDateTime(DateLabelFormat, DisplayDate));
+    {$ENDIF}
 
     { draw the text }
     if (DisplayOnly) and
diff --git a/components/tvplanit/source/vpprtprvdlg.pas b/components/tvplanit/source/vpprtprvdlg.pas
index 319722210..75eeb6867 100644
--- a/components/tvplanit/source/vpprtprvdlg.pas
+++ b/components/tvplanit/source/vpprtprvdlg.pas
@@ -415,11 +415,11 @@ begin
   if Key = VK_ESCAPE then
     actCancel.Execute;
 end;
-
+                (*
 initialization
 {$IFDEF LCL}
   {$I vpprtprvdlg.lrs}
 {$ENDIF}
-
+                  *)
 end.
   
diff --git a/components/tvplanit/source/vpreseditdlg.pas b/components/tvplanit/source/vpreseditdlg.pas
index bf7c8f99e..7c96af555 100644
--- a/components/tvplanit/source/vpreseditdlg.pas
+++ b/components/tvplanit/source/vpreseditdlg.pas
@@ -238,11 +238,12 @@ procedure TResEditForm.SetControls;
 begin
   OKBtn.Enabled := (DescriptionEdit.Text <> '');
 end;
-
+             (*
 initialization
 {$IFDEF LCL}
   {$I vpreseditdlg.lrs}
 {$ENDIF}
+               *)
 
 end.
   
diff --git a/components/tvplanit/source/vpselresdlg.pas b/components/tvplanit/source/vpselresdlg.pas
index 39500c36a..6b7993ca0 100644
--- a/components/tvplanit/source/vpselresdlg.pas
+++ b/components/tvplanit/source/vpselresdlg.pas
@@ -75,11 +75,12 @@ procedure TfrmSelectResource.btnEditClick(Sender: TObject);
 begin
   VpResourceEditDialog1.Execute;
 end;
-
+          (*
 initialization
 {$IFDEF LCL}
   {$I vpselresdlg.lrs}
 {$ENDIF}
+*)
 
 end.
  
diff --git a/components/tvplanit/source/vptaskeditdlg.pas b/components/tvplanit/source/vptaskeditdlg.pas
index 3051cd93f..ea58f5b62 100644
--- a/components/tvplanit/source/vptaskeditdlg.pas
+++ b/components/tvplanit/source/vptaskeditdlg.pas
@@ -224,11 +224,11 @@ begin
   end;
 end;
 {=====}
-
+      (*
 initialization
 {$IFDEF LCL}
   {$I vptaskeditdlg.lrs}
 {$ENDIF}
-
+        *)
 end.
   
diff --git a/components/tvplanit/source/vpwavdlg.pas b/components/tvplanit/source/vpwavdlg.pas
index 1396020cd..9151337d6 100644
--- a/components/tvplanit/source/vpwavdlg.pas
+++ b/components/tvplanit/source/vpwavdlg.pas
@@ -187,11 +187,11 @@ begin
   if Key = VK_ESCAPE then
     Close;
 end;
-
+      (*
 initialization
 {$IFDEF LCL}
   {$I vpwavdlg.lrs}
 {$ENDIF}
-
+        *)
 end.
   
diff --git a/components/tvplanit/source/vpweekview.pas b/components/tvplanit/source/vpweekview.pas
index 7b7013383..18d3d7206 100644
--- a/components/tvplanit/source/vpweekview.pas
+++ b/components/tvplanit/source/vpweekview.pas
@@ -810,7 +810,11 @@ var
       if FDayHeadAttributes.Bordered then
         TPSRectangle (RenderCanvas, Angle, RenderIn, TextRect);
       { Fix Header String }
+      {$IF FPC_FULLVERSION >= 30000}
+      DayStr := FormatDateTime(FDayHeadAttributes.DateFormat, StartDate + I);
+      {$ELSE}
       DayStr := SysToUTF8(FormatDateTime(FDayHeadAttributes.DateFormat, StartDate + I));
+      {$ENDIF}
       SL := RenderCanvas.TextWidth(DayStr);
       if SL > TextRect.Right - TextRect.Left then begin
         DayStr := GetDisplayString(RenderCanvas, DayStr, 0, TextRect.Right -