diff --git a/components/orpheus/ORBTNCAL.bmp b/components/orpheus/ORBTNCAL.bmp
new file mode 100644
index 000000000..b5ab49f4c
Binary files /dev/null and b/components/orpheus/ORBTNCAL.bmp differ
diff --git a/components/orpheus/ORLEFTARROW.bmp b/components/orpheus/ORLEFTARROW.bmp
new file mode 100644
index 000000000..054b6511f
Binary files /dev/null and b/components/orpheus/ORLEFTARROW.bmp differ
diff --git a/components/orpheus/ORLEFTARROWS.bmp b/components/orpheus/ORLEFTARROWS.bmp
new file mode 100644
index 000000000..614e2fa34
Binary files /dev/null and b/components/orpheus/ORLEFTARROWS.bmp differ
diff --git a/components/orpheus/ORREVERT.bmp b/components/orpheus/ORREVERT.bmp
new file mode 100644
index 000000000..39225bf7e
Binary files /dev/null and b/components/orpheus/ORREVERT.bmp differ
diff --git a/components/orpheus/ORRIGHTARROW.bmp b/components/orpheus/ORRIGHTARROW.bmp
new file mode 100644
index 000000000..b8145391a
Binary files /dev/null and b/components/orpheus/ORRIGHTARROW.bmp differ
diff --git a/components/orpheus/ORRIGHTARROWS.bmp b/components/orpheus/ORRIGHTARROWS.bmp
new file mode 100644
index 000000000..0f024016d
Binary files /dev/null and b/components/orpheus/ORRIGHTARROWS.bmp differ
diff --git a/components/orpheus/ORTODAY.bmp b/components/orpheus/ORTODAY.bmp
new file mode 100644
index 000000000..223378471
Binary files /dev/null and b/components/orpheus/ORTODAY.bmp differ
diff --git a/components/orpheus/OrphStatus.html b/components/orpheus/OrphStatus.html
index 03b410c8a..fd573d97f 100644
--- a/components/orpheus/OrphStatus.html
+++ b/components/orpheus/OrphStatus.html
@@ -33,6 +33,12 @@
 <A name="Whats_New"></A><H3>What's New</H3>
 
 <UL>
+<LI>20081229 release (0.2.1):
+  <UL>
+  <LI>Adds TOvcCalendar.
+  <LI>Updated results of testing for Lazarus 0.9.26. GTK2 widgetset now working better.<P>
+  </UL>
+
 <LI>20080720 release (0.2.0):
   <UL>
   <LI>Recent change in the Lazarus LCL broke Orpheus TOvcTable on Windows. This release 
@@ -213,23 +219,23 @@ access to the Lazarus install folder. After rebuilding, be sure to start
 <TD>XP SP2</TD>
 <TD>&nbsp;</TD>
 <TD>win32</TD>
-<TD>20080714 snapshot of 0.9.25 with FPC 2.2.2rc2</TD>
+<TD>Stable 0.9.26 with FPC 2.2.2</TD>
 </TR>
 
 <TR VALIGN=TOP>
 <TD>OS X</TD>
 <TD>10.4.11 (Tiger) on PowerPC</TD>
-<TD>gtk: 1.2.0.9.1<BR>gtk2: 2.6.10<BR>qt: 4.3.0</TD>
-<TD>gtk, gtk2, carbon, qt</TD>
-<TD>20080714 snapshot of 0.9.25 with FPC 2.2.2rc2</TD>
+<TD>gtk: 1.2.0.9.1<BR>gtk2: 2.12.9</TD>
+<TD>gtk, gtk2, carbon</TD>
+<TD>Stable 0.9.26 with FPC 2.2.2</TD>
 </TR>
 
 <TR VALIGN=TOP>
 <TD>Linux</TD>
-<TD>SUSE 10.1</TD>
-<TD>gtk: 1.2.10-907</TD>
-<TD>gtk</TD>
-<TD>Stable 0.9.20 with FPC 2.0.4</TD>
+<TD>--not tested--</TD>
+<TD>&nbsp;</TD>
+<TD>&nbsp;</TD>
+<TD>&nbsp;</TD>
 </TR>
 
 </TABLE><BR>
@@ -253,6 +259,7 @@ headers, row labels, string, memo, check box, combo box, bitmap).
 <LI>TestSimpField - demos TOvcSimpleField validation (Windows only for now)
 <LI>TestTblEdits - demos TOvcTCString, TOvcTCSimpleField validation and TO32TCFlexEdit
 validation (Windows only for now)
+<LI>TestCalendar - demos TOvcCalendar
 </UL>
 
 To see the TOvcSpinner control in action, try out the table's Rows and Columns
@@ -345,7 +352,24 @@ descending from an existing edit control such as TCustomEdit. Currently
 TOvcSimpleField and TOvcTCSimpleField do not work on non-Windows widgetsets.<P>
 <LI>The GTK widgetset does not support TOvcRotatedLabel, apparently
 because the GetTextMetrics function is not fully implemented on that
-widgetset. 
+widgetset.<P>
+<LI>The Carbon widgetset has a few minor limitations as of Lazarus 0.9.26 that
+affect some of the Orpheus controls. Setting the BorderStyle property does
+nothing with Carbon in custom controls such as TOvcVirtualListBox, TOvcCalendar
+and TOvcTable. Also, since the Carbon widgetset does not implement the bvLowered
+bevel style, changing the focus of a TOvcCalendar control does not change
+the look of the currently selected date as it should (the date remains bvRaised,
+which actually looks lowered with the Carbon widgetset).<P>
+<LI>Differences between Delphi VCL and Lazarus LCL affect some Orpheus controls.
+For example, VCL messages like CM_ENTER and CM_EXIT are not supported in the 
+LCL. In a couple places, the ported code uses LM_SETFOCUS and LM_KILLFOCUS
+messages to obtain some functionality. Similarly, the lack of LCL support for the
+CM_CTL3DCHANGED message means that changing the Ctl3D property in Lazarus for
+controls such as TOvcCalendar may not update the control's design (reloading the 
+form will show the correct design). Finally, some properties like Ctl3D are True
+by default in Delphi but False in Lazarus, meaning forms converted from Delphi
+may not look quite the same for properties with default values until you
+explicitly set the properties in Lazarus or in your code.
 </OL>
 
 <HR>
@@ -372,7 +396,7 @@ widgetset.
 <TD>gtk widgetset doesn't support</TD>
 <TD>Working</TD>
 <TD>Not working</TD>
-<TD>Crashes</TD>
+<TD>Partial</TD>
 <TD>Working</TD>
 <TD>Working</TD>
 </TR>
@@ -408,7 +432,7 @@ widgetset.
 <TD>&nbsp;</TD>
 <TD>Working</TD>
 <TD>Working</TD>
-<TD>Working</TD>
+<TD>Partial</TD>
 <TD>Working</TD>
 <TD>Crashes</TD>
 </TR>
@@ -425,15 +449,27 @@ widgetset.
 <TD>Partial</TD>
 </TR>
 
+<TR VALIGN=TOP>
+<TD>TOvcCalendar<BR><IMG SRC="TOVCCALENDAR.bmp"></TD>
+<TD>TCustomControl</TD>
+<TD>Calendar control</TD>
+<TD>&nbsp;</TD>
+<TD>Working</TD>
+<TD>Working</TD>
+<TD>Working</TD>
+<TD>Working</TD>
+<TD>?</TD>
+</TR>
+
 <TR VALIGN=TOP>
 <TD>TOvcSimpleField<BR><IMG SRC="TOVCSIMPLEFIELD.bmp"></TD>
 <TD>TCustomControl</TD>
 <TD>Edit control with validation</TD>
 <TD>&nbsp;</TD>
 <TD>Working</TD>
-<TD>Not working</TD>
-<TD>Not working</TD>
-<TD>Not working</TD>
+<TD>Partial</TD>
+<TD>Partial</TD>
+<TD>Partial</TD>
 <TD>Crashes</TD>
 </TR>
 
@@ -503,9 +539,9 @@ widgetset.
 <TD>Table cell for editing strings, with validation</TD>
 <TD>&nbsp;</TD>
 <TD>Working</TD>
-<TD>Not working</TD>
-<TD>Not working</TD>
-<TD>Not working</TD>
+<TD>Partial</TD>
+<TD>Partial</TD>
+<TD>Crashes</TD>
 <TD>Crashes</TD>
 </TR>
 
@@ -695,18 +731,15 @@ However, TO32FlexEdit doesn't need TOvcController.<P>
 <HR>
 <A name="Other_Resources"></A><H3>Other Resources</H3>
 
-Qt widgetset status:<P>
-<A HREF="http://wiki.lazarus.freepascal.org/Qt_Interface">http://wiki.lazarus.freepascal.org/Qt_Interface</A><P>
-
-Carbon widgetset status:<P>
-<A HREF="http://wiki.lazarus.freepascal.org/Carbon_Interface">http://wiki.lazarus.freepascal.org/Carbon_Interface</A><P>
+Status of Lazarus widgetsets:<P>
+<A HREF="http://wiki.lazarus.freepascal.org/Roadmap">http://wiki.lazarus.freepascal.org/Roadmap</A><P>
 
 OS X tips for Lazarus:<P>
 <A HREF="http://wiki.lazarus.freepascal.org/OS_X_Programming_Tips">http://wiki.lazarus.freepascal.org/OS_X_Programming_Tips</A><P>
 
 <P>
 <HR>
-Last updated: July 20, 2008
+Last updated: December 29, 2008
 <P>
 
 </BODY>
diff --git a/components/orpheus/TOVCCALENDAR.bmp b/components/orpheus/TOVCCALENDAR.bmp
new file mode 100644
index 000000000..688f10ec3
Binary files /dev/null and b/components/orpheus/TOVCCALENDAR.bmp differ
diff --git a/components/orpheus/TOVCDATEEDIT.bmp b/components/orpheus/TOVCDATEEDIT.bmp
new file mode 100644
index 000000000..fb386ba4e
Binary files /dev/null and b/components/orpheus/TOVCDATEEDIT.bmp differ
diff --git a/components/orpheus/alltests-carbon.sh b/components/orpheus/alltests-carbon.sh
index 5e6da6c96..7143b039b 100644
--- a/components/orpheus/alltests-carbon.sh
+++ b/components/orpheus/alltests-carbon.sh
@@ -13,3 +13,4 @@ $lazdir/lazbuild -d --ws=carbon tests/TestTable/project1.lpi
 $lazdir/lazbuild -d --ws=carbon tests/TestTblEdits/project1.lpi
 $lazdir/lazbuild -d --ws=carbon tests/TestURL/project1.lpi
 $lazdir/lazbuild -d --ws=carbon tests/TestVLB/project1.lpi
+$lazdir/lazbuild -d --ws=carbon tests/TestCalendar/project1.lpi
diff --git a/components/orpheus/alltests-gtk.sh b/components/orpheus/alltests-gtk.sh
index 64b8df380..d84f6a282 100644
--- a/components/orpheus/alltests-gtk.sh
+++ b/components/orpheus/alltests-gtk.sh
@@ -13,3 +13,4 @@ $lazdir/lazbuild -d --ws=gtk tests/TestTable/project1.lpi
 $lazdir/lazbuild -d --ws=gtk tests/TestTblEdits/project1.lpi
 $lazdir/lazbuild -d --ws=gtk tests/TestURL/project1.lpi
 $lazdir/lazbuild -d --ws=gtk tests/TestVLB/project1.lpi
+$lazdir/lazbuild -d --ws=gtk tests/TestCalendar/project1.lpi
diff --git a/components/orpheus/alltests-win.bat b/components/orpheus/alltests-win.bat
index a904f54c4..7c4dfc665 100644
--- a/components/orpheus/alltests-win.bat
+++ b/components/orpheus/alltests-win.bat
@@ -1,3 +1,4 @@
+setlocal
 set lazpath="c:\tools\lazarus"
 if not exist %lazpath% (set lazpath="c:\lazarus")
 "%lazpath%\lazbuild" -d tests/TestFlexEdit/project1.lpi
@@ -9,3 +10,4 @@ if not exist %lazpath% (set lazpath="c:\lazarus")
 "%lazpath%\lazbuild" -d tests/TestTblEdits/project1.lpi
 "%lazpath%\lazbuild" -d tests/TestURL/project1.lpi
 "%lazpath%\lazbuild" -d tests/TestVLB/project1.lpi
+"%lazpath%\lazbuild" -d tests/TestCalendar/project1.lpi
diff --git a/components/orpheus/makebaseres.bat b/components/orpheus/makebaseres.bat
new file mode 100644
index 000000000..3b41d2cfd
--- /dev/null
+++ b/components/orpheus/makebaseres.bat
@@ -0,0 +1 @@
+\tools\xdev\lazres ovcbase.lrs ORTCCOMBOARROW.bmp ORTCCHECKGLYPHS.bmp ORBTNCLC.bmp ORLEFTARROW.bmp ORLEFTARROWS.bmp ORRIGHTARROW.bmp ORRIGHTARROWS.bmp ORREVERT.bmp ORTODAY.bmp ORBTNCAL.bmp ORCOLUMNMOVECURSOR.cur ORROWMOVECURSOR.cur
\ No newline at end of file
diff --git a/components/orpheus/makeregres.bat b/components/orpheus/makeregres.bat
new file mode 100644
index 000000000..93d164bb6
--- /dev/null
+++ b/components/orpheus/makeregres.bat
@@ -0,0 +1 @@
+\tools\xdev\lazres ovcreg.lrs TOVCCONTROLLER.bmp TOVCTCSTRING.bmp TOVCTCCOLHEAD.bmp TOVCTCROWHEAD.bmp TOVCTCCOMBOBOX.bmp TOVCTCSIMPLEFIELD.bmp TOVCTCCHECKBOX.bmp TOVCTABLE.bmp TOVCURL.bmp TOVCSIMPLEFIELD.bmp TO32FLEXEDIT.bmp TO32TCFLEXEDIT.bmp TOVCTCMEMO.bmp TOVCTCBITMAP.bmp TOVCTCGLYPH.bmp TOVCTCICON.bmp TOVCROTATEDLABEL.bmp TOVCSPINNER.bmp TOVCLABEL.bmp TOVCVIRTUALLISTBOX.bmp TOVCCALENDAR.bmp TOVCDATEEDIT.bmp ORREDDOT.bmp ORBLUEDOT.bmp
\ No newline at end of file
diff --git a/components/orpheus/mymisc.pas b/components/orpheus/mymisc.pas
index ec15b48d9..628213725 100644
--- a/components/orpheus/mymisc.pas
+++ b/components/orpheus/mymisc.pas
@@ -49,7 +49,7 @@ interface
 
 uses 
   {$IFDEF MSWINDOWS} Windows, {$ELSE} Types, {$ENDIF}
-   LclIntf, LMessages, LclType, 
+   LclIntf, LMessages, LclType, InterfaceBase,
   {$IFDEF LINUX} FileUtil, {$ENDIF}
    GraphType, Graphics, Controls, SysUtils;
 
@@ -970,9 +970,15 @@ begin
   ARect := Client;
    {The way LCL TCustomSpeedButton draws a button}
   if IsDown then
-    Canvas.Frame3D(ARect, BevelWidth, bvLowered)
+    begin
+    if WidgetSet.LCLPlatform <> lpCarbon then
+      Canvas.Frame3D(ARect, BevelWidth, bvLowered)
+    else  //bvLowered currently not supported on Carbon.
+      Canvas.Frame3D(ARect, BevelWidth, bvRaised)
+    end
   else
     Canvas.Frame3D(ARect, BevelWidth, bvRaised);
+  Result := Client;  //Should reduce dimensions by edges and bevels.
 end;
 
 
diff --git a/components/orpheus/myovcreg.pas b/components/orpheus/myovcreg.pas
index fab0a440e..c7e50f47b 100644
--- a/components/orpheus/myovcreg.pas
+++ b/components/orpheus/myovcreg.pas
@@ -64,6 +64,8 @@ uses
   ovcsf,
   o32flxed,
   o32tcflx,
+  ovccal,
+//  ovcedcal,
 //  ovccalc,
 //  ovcclrcb,
   ovcsc,
@@ -208,6 +210,8 @@ begin
   RegisterComponents('Orpheus', [TOvcSimpleField]);
 {$ENDIF}
   RegisterComponents('Orpheus', [TO32FlexEdit]);
+  RegisterComponents('Orpheus', [TOvcCalendar]);
+//  RegisterComponents('Orpheus', [TOvcDateEdit]);  //Needs ButtonOkay fixes like TO32FlexEdit
 //  RegisterComponents('Orpheus', [TOvcCalculator]);
 //  RegisterComponents('Orpheus', [TOvcColorComboBox]);
   RegisterComponents('Orpheus', [TOvcTable]); 
diff --git a/components/orpheus/orpheus.lpk b/components/orpheus/orpheus.lpk
index f7004554d..136821639 100644
--- a/components/orpheus/orpheus.lpk
+++ b/components/orpheus/orpheus.lpk
@@ -31,7 +31,7 @@
 "/>
     <License Value="MPL 1.1
 "/>
-    <Version Minor="2" Release="0"/>
+    <Version Minor="2" Release="1"/>
     <Files Count="1">
       <Item1>
         <Filename Value="myovcreg.pas"/>
diff --git a/components/orpheus/ovcbase.lrs b/components/orpheus/ovcbase.lrs
index ac8d0e660..a221158c2 100644
--- a/components/orpheus/ovcbase.lrs
+++ b/components/orpheus/ovcbase.lrs
@@ -34,6 +34,76 @@ LazarusResources.Add('ORBTNCLC','BMP',[
   +#8#8#8#8#8#0#0#0#8#136#136#136#136#0#0#0#8#0#0#0#8#0#0#0#8#0#14#14#8#0#0#0#8
   +#0#0#0#8#0#0#0#8#136#136#136#136#0#0#0'0'#0#0#0#0'0'#0#0
 ]);
+LazarusResources.Add('ORLEFTARROW','BMP',[
+  'BM'#206#0#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#11#0#0#0#11#0#0#0#1#0#4#0#0#0#0#0'X'
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128
+  +#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0
+  +#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#255#255
+  +#255#255#255#240#0#0#255#255#255#255#255#240#0#0#255#255#255#255#255#240#0#0
+  +#255#255#0#255#255#240#0#0#255#240#0#255#255#240#0#0#255#0#0#255#255#240#0#0
+  +#240#0#0#255#255#240#0#0#255#0#0#255#255#240#0#0#255#240#0#255#255#240#0#0
+  +#255#255#0#255#255#240#0#0#255#255#255#255#255#240#0#0
+]);
+LazarusResources.Add('ORLEFTARROWS','BMP',[
+  'BM'#206#0#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#13#0#0#0#11#0#0#0#1#0#4#0#0#0#0#0'X'
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128
+  +#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0
+  +#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#255#255
+  +#255#255#255#255#240#0#255#255#255#255#255#255#240#0#255#255#255#255#255#255
+  +#240#0#255#255#0#255#255#0#240#0#255#240#0#255#240#0#240#0#255#0#0#255#0#0
+  +#240#0#240#0#0#240#0#0#240#0#255#0#0#255#0#0#240#0#255#240#0#255#240#0#240#0
+  +#255#255#0#255#255#0#240#0#255#255#255#255#255#255#240#0
+]);
+LazarusResources.Add('ORRIGHTARROW','BMP',[
+  'BM'#206#0#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#11#0#0#0#11#0#0#0#1#0#4#0#0#0#0#0'X'
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128
+  +#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0
+  +#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#255#255
+  +#255#255#255#240#0#0#255#255#255#255#255#240#0#0#255#255#255#255#255#240#0#0
+  +#240#15#255#255#255#240#0#0#240#0#255#255#255#240#0#0#240#0#15#255#255#240#0
+  +#0#240#0#0#255#255#240#0#0#240#0#15#255#255#240#0#0#240#0#255#255#255#240#0#0
+  +#240#15#255#255#255#240#0#0#255#255#255#255#255#240#0#0
+]);
+LazarusResources.Add('ORRIGHTARROWS','BMP',[
+  'BM'#206#0#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#13#0#0#0#11#0#0#0#1#0#4#0#0#0#0#0'X'
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128
+  +#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0
+  +#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#255#255
+  +#255#255#255#255#240#0#255#255#255#255#255#255#240#0#255#255#255#255#255#255
+  +#240#0#240#15#255#240#15#255#240#0#240#0#255#240#0#255#240#0#240#0#15#240#0
+  +#15#240#0#240#0#0#240#0#0#240#0#240#0#15#240#0#15#240#0#240#0#255#240#0#255
+  +#240#0#240#15#255#240#15#255#240#0#255#255#255#255#255#255#240#0
+]);
+LazarusResources.Add('ORREVERT','BMP',[
+  'BM'#206#0#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#14#0#0#0#11#0#0#0#1#0#4#0#0#0#0#0'X'
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128
+  +#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0
+  +#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#255#255
+  +#255#255#255#255#255#0#255#255#255#255#255#255#255#0#136#136#136#136#136#136
+  +#136#0#136#136#136#136#136't'#136#0#132'DD'#136#136#132'x'#0#132'DH'#136#136
+  +#136'H'#0#132'D'#136#136#136#136'H'#0#132'HH'#136#136#136'H'#0#132#136#132'H'
+  +#136#132'x'#0#136#136#136#132'DG'#136#0#136#136#136#136#136#136#136#0
+]);
+LazarusResources.Add('ORTODAY','BMP',[
+  'BM'#206#0#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#14#0#0#0#11#0#0#0#1#0#4#0#0#0#0#0'X'
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128
+  +#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0
+  +#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#255#255
+  +#255#255#255#255#255#0#255#255#255#255#255#255#255#0#255#255#255#255#255#247
+  +#15#0#255#255#255#255#255#255'p'#0#255#255#255#240#255#255#240#0#255#247#255
+  +#240#255#247#240#0#255#0#15#240#255#0#15#0#240#247#255#240#255#247#255#0#240
+  +#255#255#0#15#255#255#0#240''#255#255#255#255#255#0#255#7#255#255#255#255
+  +#255#0
+]);
+LazarusResources.Add('ORBTNCAL','BMP',[
+  'BM'#206#0#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#11#0#0#0#11#0#0#0#1#0#4#0#0#0#0#0'X'
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128
+  +#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0
+  +#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0'0'#0#0#0
+  +#0'0'#0#0#8#135#136'x'#136#0#0#0#9#135#152'y'#136#0#0#0#7'wwww'#0#0#0#8#135
+  +#136'x'#136#0#0#0#9#135#152'y'#136#0#0#0#7'wwww'#0#0#0#8#135#136'x'#136#0#0#0
+  +#9#135#152'y'#136#0#0#0#0#0#0#0#0#0#0#0'<'#199'ww'#204'0'#0#0
+]);
 LazarusResources.Add('ORCOLUMNMOVECURSOR','CUR',[
   #0#0#2#0#1#0'  '#0#0#0#0#0#0'0'#1#0#0#22#0#0#0'('#0#0#0' '#0#0#0'@'#0#0#0#1#0
   +#1#0#0#0#0#0#0#1#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#255#255#0#0
diff --git a/components/orpheus/ovccal.pas b/components/orpheus/ovccal.pas
index 30715bfa4..3dbf7b17f 100644
--- a/components/orpheus/ovccal.pas
+++ b/components/orpheus/ovccal.pas
@@ -221,7 +221,9 @@ type
     procedure CMCtl3DChanged(var Msg : TMessage);
       message CM_CTL3DCHANGED;
     procedure CMEnter(var Msg : TMessage);
-      message CM_ENTER;
+      message {$IFNDEF LCL} CM_ENTER; {$ELSE} LM_SETFOCUS; {$ENDIF}
+       //CM_ messages not supported in LCL, so use something similar
+       // so clRevertDate is initialized properly.
     procedure CMExit(var Msg : TMessage);
       message CM_EXIT;
     procedure CMFontChanged(var Msg : TMessage);
@@ -815,8 +817,13 @@ begin
   Height        := 140;
   TabStop       := True;
   Width         := 200;
+{$IFDEF MSWINDOWS}
   Font.Name     := 'MS Sans Serif';
   Font.Size     := 8;
+{$ELSE}  //Size 8 doesn't convert in LCL to Height -11 as it should.
+  Font.Name     := 'Arial';
+  Font.Height   := -11;
+{$ENDIF}
 
   FBorderStyle  := bsNone;
   FDayNameWidth := 3;
@@ -922,6 +929,10 @@ begin
     Params.ExStyle := Params.ExStyle or WS_EX_CLIENTEDGE;
   end;
 
+{$IFDEF LCL}
+  inherited SetBorderStyle(FBorderStyle);
+{$ENDIF}
+
   {set style to reflect desire for double clicks}
   if FWantDblClicks then
     ControlStyle := ControlStyle + [csDoubleClicks]
diff --git a/components/orpheus/ovcreg.lrs b/components/orpheus/ovcreg.lrs
index 70257c4cb..6a1db435d 100644
--- a/components/orpheus/ovcreg.lrs
+++ b/components/orpheus/ovcreg.lrs
@@ -1566,6 +1566,163 @@ LazarusResources.Add('TOVCVIRTUALLISTBOX','BMP',[
   +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
   +#128
 ]);
+LazarusResources.Add('TOVCCALENDAR','BMP',[
+  'BM'#246#6#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#24#0#0#0#24#0#0#0#1#0#24#0#0#0#0#0
+  +#192#6#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#255#255#255#0#0#0#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128
+  +#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#0#128#128#0#128#128
+  +#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#0#0#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#0#0#0#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#0#128#128
+  +#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#255#0#0#255#0#0
+  +#255#0#0#255#0#0#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#0#128#128#0
+  +#128#128#255#0#0#255#0#0#255#0#0#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#255#0#0#255
+  +#0#0#0#128#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#0#128#128#255
+  +#0#0#255#0#0#255#0#0#255#0#0#255#0#0#0#128#128#0#128#128#0#128#128#0#128#128
+  +#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128
+  +#0#128#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#255#0#0#255#0#0
+  +#255#0#0#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128#0
+  +#128#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#255#0#0#0#128#128#0
+  +#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128#0
+  +#128#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#255#0#0#0#128#128#0
+  +#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128#0
+  +#128#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#0#128#128#0#128#128
+  +#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128#0#128#128#0#128#128
+  +#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128
+  +#0#128#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#0#128#128#0#128
+  +#128#255#0#0#255#0#0#255#0#0#255#0#0#0#128#128#0#128#128#0#128#128#0#128#128
+  +#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128
+  +#0#128#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128
+  +#128#0#128#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#255#0#0#0#128
+  +#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128
+  +#128#0#128#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#255#0#0#0#128
+  +#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#255#0#0#255#0#0#0#128#128
+  +#0#128#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#255#0#0#255#0#0
+  +#255#0#0#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#255#0#0#255#0#0#255#0#0#255#0#0#0#128#128#0#128
+  +#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#0#128#128#255#0#0#255#0
+  +#0#255#0#0#255#0#0#255#0#0#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128
+  +#0#128#128#0#128#128#0#128#128#0#128#128#255#0#0#255#0#0#0#128#128#0#128#128
+  +#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#0#128#128#0#128#128#255#0#0
+  +#255#0#0#255#0#0#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128
+  +#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#0#0
+  +#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#0#0#0#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#128#0#128#128#0#128#128#0#128
+  ,#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128#0#128#128
+  +#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#255#255#255#0#0#0#0#128#128#0#128#128
+  +#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128
+]);
+LazarusResources.Add('TOVCDATEEDIT','BMP',[
+  'BM'#246#6#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#24#0#0#0#24#0#0#0#1#0#24#0#0#0#0#0
+  +#192#6#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#0#255#0#0#255#0#0#255#0#0#255#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#128#128#0#128#128
+  +#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#128#128#128#128#128#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#255#255
+  +#255#0#128#128#128#128#128#0#0#0#192#192#192#192#192#192#192#192#192#192#192
+  +#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192
+  +#192#192#192#192#192#192#192#192#192#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255
+  +#0#0#255#192#192#192#255#255#255#0#128#128#128#128#128#0#0#0#255#255#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#0#0#255#0#0#255#0#0#255
+  +#0#0#255#0#0#255#0#0#255#255#255#255#192#192#192#255#255#255#0#128#128#128
+  +#128#128#0#0#0#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#0#0
+  +#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#192#192#192#192#192#192#192#192
+  +#192#255#255#255#0#128#128#128#128#128#0#0#0#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+  +#255#255#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#192#192#192#192
+  +#192#192#192#192#192#192#192#192#255#255#255#0#128#128#128#128#128#0#0#0#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#255#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255
+  +#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#255#255#255#0
+  +#128#128#128#128#128#0#0#0#0#0#0#255#255#255#255#255#255#255#255#255#0#0#0
+  +#255#255#255#0#0#0#0#0#0#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#192
+  +#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#255#255
+  +#255#0#128#128#128#128#128#0#0#0#0#0#0#255#255#255#255#255#255#255#255#255#0
+  +#0#0#255#255#255#0#0#0#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#255
+  +#255#255#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192
+  +#192#255#255#255#0#128#128#128#128#128#0#0#0#0#0#0#255#255#255#0#0#0#255#255
+  +#255#0#0#0#255#255#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#0
+  +#255#255#255#192#192#192#192#192#192#0#0#0#192#192#192#192#192#192#192#192
+  +#192#255#255#255#0#128#128#128#128#128#0#0#0#0#0#0#0#0#0#255#255#255#0#0#0#0
+  +#0#0#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#0#255#255#255#0#0#0
+  +#192#192#192#0#0#0#0#0#0#0#0#0#192#192#192#192#192#192#255#255#255#0#128#128
+  +#128#128#128#0#0#0#0#0#0#255#255#255#255#255#255#255#255#255#0#0#255#0#0#255
+  +#0#0#255#0#0#255#0#0#255#0#0#255#255#255#255#0#0#0#255#255#255#0#0#0#192#192
+  +#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#255#255#255
+  +#0#128#128#128#128#128#0#0#0#255#255#255#255#255#255#255#255#255#0#0#255#0#0
+  +#255#0#0#255#0#0#255#0#0#255#0#0#255#255#255#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#192#192#192#192#192#192#192#192#192#192#192#192#192#192
+  +#192#192#192#192#255#255#255#0#128#128#128#128#128#0#0#0#255#255#255#255#255
+  +#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#255#255#255#255#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#192#192#192#192#192#192#192
+  +#192#192#192#192#192#192#192#192#192#192#192#255#255#255#0#128#128#128#128
+  +#128#0#0#0#255#255#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+  +#255#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192#192
+  +#255#255#255#0#128#128#128#128#128#0#0#0#0#0#255#0#0#255#0#0#255#0#0#255#0#0
+  +#255#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#255#255#255#0#128#128#128#128#128#0#0#255#0#0#255#0#0
+  +#255#0#0#255#0#0#255#0#0#255#128#128#128#128#128#128#128#128#128#128#128#128
+  +#128#128#128#128#128#128#128#128#128#128#128#128#128#128#128#128#128#128#128
+  ,#128#128#128#128#128#128#128#128#128#128#128#128#128#128#128#128#128#0#128
+  +#128#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#0#255#0#0#255#0#0#255#0#0#255#0#0#255#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#0#255#0#0#255#0#0#255#0#0#255#0#128#128#0#128#128#0#128#128
+  +#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#0#255#0#0#255#0#0#255#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128
+  +#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0#128#128#0
+  +#128#128#0#128#128#0#128#128
+]);
 LazarusResources.Add('ORREDDOT','BMP',[
   'BM>'#1#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#7#0#0#0#11#0#0#0#1#0#24#0#0#0#0#0#8#1#0
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#255#255#255#255#255#255#255#255#255
diff --git a/components/orpheus/tests/TestCalendar/project1.bdsproj b/components/orpheus/tests/TestCalendar/project1.bdsproj
new file mode 100644
index 000000000..acea5547a
--- /dev/null
+++ b/components/orpheus/tests/TestCalendar/project1.bdsproj
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BorlandProject>
+  <PersonalityInfo>
+    <Option>
+      <Option Name="Personality">Delphi.Personality</Option>
+      <Option Name="ProjectType">VCLApplication</Option>
+      <Option Name="Version">1.0</Option>
+      <Option Name="GUID">{88CE0102-AC1C-464D-AE40-EC184791C58A}</Option>
+    </Option>
+  </PersonalityInfo>
+  <Delphi.Personality>
+    <Source>
+      <Source Name="MainSource">project1.dpr</Source>
+    </Source>
+    <FileVersion>
+      <FileVersion Name="Version">7.0</FileVersion>
+    </FileVersion>
+    <Compiler>
+      <Compiler Name="A">8</Compiler>
+      <Compiler Name="B">0</Compiler>
+      <Compiler Name="C">1</Compiler>
+      <Compiler Name="D">1</Compiler>
+      <Compiler Name="E">0</Compiler>
+      <Compiler Name="F">0</Compiler>
+      <Compiler Name="G">1</Compiler>
+      <Compiler Name="H">1</Compiler>
+      <Compiler Name="I">1</Compiler>
+      <Compiler Name="J">0</Compiler>
+      <Compiler Name="K">0</Compiler>
+      <Compiler Name="L">1</Compiler>
+      <Compiler Name="M">0</Compiler>
+      <Compiler Name="N">1</Compiler>
+      <Compiler Name="O">1</Compiler>
+      <Compiler Name="P">1</Compiler>
+      <Compiler Name="Q">0</Compiler>
+      <Compiler Name="R">0</Compiler>
+      <Compiler Name="S">0</Compiler>
+      <Compiler Name="T">0</Compiler>
+      <Compiler Name="U">0</Compiler>
+      <Compiler Name="V">1</Compiler>
+      <Compiler Name="W">0</Compiler>
+      <Compiler Name="X">1</Compiler>
+      <Compiler Name="Y">1</Compiler>
+      <Compiler Name="Z">1</Compiler>
+      <Compiler Name="ShowHints">True</Compiler>
+      <Compiler Name="ShowWarnings">True</Compiler>
+      <Compiler Name="UnitAliases">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Compiler>
+      <Compiler Name="NamespacePrefix"></Compiler>
+      <Compiler Name="GenerateDocumentation">False</Compiler>
+      <Compiler Name="DefaultNamespace"></Compiler>
+      <Compiler Name="SymbolDeprecated">True</Compiler>
+      <Compiler Name="SymbolLibrary">True</Compiler>
+      <Compiler Name="SymbolPlatform">True</Compiler>
+      <Compiler Name="SymbolExperimental">True</Compiler>
+      <Compiler Name="UnitLibrary">True</Compiler>
+      <Compiler Name="UnitPlatform">True</Compiler>
+      <Compiler Name="UnitDeprecated">True</Compiler>
+      <Compiler Name="UnitExperimental">True</Compiler>
+      <Compiler Name="HResultCompat">True</Compiler>
+      <Compiler Name="HidingMember">True</Compiler>
+      <Compiler Name="HiddenVirtual">True</Compiler>
+      <Compiler Name="Garbage">True</Compiler>
+      <Compiler Name="BoundsError">True</Compiler>
+      <Compiler Name="ZeroNilCompat">True</Compiler>
+      <Compiler Name="StringConstTruncated">True</Compiler>
+      <Compiler Name="ForLoopVarVarPar">True</Compiler>
+      <Compiler Name="TypedConstVarPar">True</Compiler>
+      <Compiler Name="AsgToTypedConst">True</Compiler>
+      <Compiler Name="CaseLabelRange">True</Compiler>
+      <Compiler Name="ForVariable">True</Compiler>
+      <Compiler Name="ConstructingAbstract">True</Compiler>
+      <Compiler Name="ComparisonFalse">True</Compiler>
+      <Compiler Name="ComparisonTrue">True</Compiler>
+      <Compiler Name="ComparingSignedUnsigned">True</Compiler>
+      <Compiler Name="CombiningSignedUnsigned">True</Compiler>
+      <Compiler Name="UnsupportedConstruct">True</Compiler>
+      <Compiler Name="FileOpen">True</Compiler>
+      <Compiler Name="FileOpenUnitSrc">True</Compiler>
+      <Compiler Name="BadGlobalSymbol">True</Compiler>
+      <Compiler Name="DuplicateConstructorDestructor">True</Compiler>
+      <Compiler Name="InvalidDirective">True</Compiler>
+      <Compiler Name="PackageNoLink">True</Compiler>
+      <Compiler Name="PackageThreadVar">True</Compiler>
+      <Compiler Name="ImplicitImport">True</Compiler>
+      <Compiler Name="HPPEMITIgnored">True</Compiler>
+      <Compiler Name="NoRetVal">True</Compiler>
+      <Compiler Name="UseBeforeDef">True</Compiler>
+      <Compiler Name="ForLoopVarUndef">True</Compiler>
+      <Compiler Name="UnitNameMismatch">True</Compiler>
+      <Compiler Name="NoCFGFileFound">True</Compiler>
+      <Compiler Name="ImplicitVariants">True</Compiler>
+      <Compiler Name="UnicodeToLocale">True</Compiler>
+      <Compiler Name="LocaleToUnicode">True</Compiler>
+      <Compiler Name="ImagebaseMultiple">True</Compiler>
+      <Compiler Name="SuspiciousTypecast">True</Compiler>
+      <Compiler Name="PrivatePropAccessor">True</Compiler>
+      <Compiler Name="UnsafeType">False</Compiler>
+      <Compiler Name="UnsafeCode">False</Compiler>
+      <Compiler Name="UnsafeCast">False</Compiler>
+      <Compiler Name="OptionTruncated">True</Compiler>
+      <Compiler Name="WideCharReduced">True</Compiler>
+      <Compiler Name="DuplicatesIgnored">True</Compiler>
+      <Compiler Name="UnitInitSeq">True</Compiler>
+      <Compiler Name="LocalPInvoke">True</Compiler>
+      <Compiler Name="MessageDirective">True</Compiler>
+      <Compiler Name="CodePage"></Compiler>
+    </Compiler>
+    <Linker>
+      <Linker Name="MapFile">0</Linker>
+      <Linker Name="OutputObjs">0</Linker>
+      <Linker Name="GenerateHpps">False</Linker>
+      <Linker Name="ConsoleApp">1</Linker>
+      <Linker Name="DebugInfo">False</Linker>
+      <Linker Name="RemoteSymbols">False</Linker>
+      <Linker Name="GenerateDRC">False</Linker>
+      <Linker Name="MinStackSize">16384</Linker>
+      <Linker Name="MaxStackSize">1048576</Linker>
+      <Linker Name="ImageBase">4194304</Linker>
+      <Linker Name="ExeDescription"></Linker>
+    </Linker>
+    <Directories>
+      <Directories Name="OutputDir"></Directories>
+      <Directories Name="UnitOutputDir"></Directories>
+      <Directories Name="PackageDLLOutputDir"></Directories>
+      <Directories Name="PackageDCPOutputDir"></Directories>
+      <Directories Name="SearchPath"></Directories>
+      <Directories Name="Packages"></Directories>
+      <Directories Name="Conditionals"></Directories>
+      <Directories Name="DebugSourceDirs"></Directories>
+      <Directories Name="UsePackages">False</Directories>
+    </Directories>
+    <Parameters>
+      <Parameters Name="RunParams"></Parameters>
+      <Parameters Name="HostApplication"></Parameters>
+      <Parameters Name="Launcher"></Parameters>
+      <Parameters Name="UseLauncher">False</Parameters>
+      <Parameters Name="DebugCWD"></Parameters>
+      <Parameters Name="Debug Symbols Search Path"></Parameters>
+      <Parameters Name="LoadAllSymbols">True</Parameters>
+      <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+    </Parameters>
+    <Language>
+      <Language Name="ActiveLang"></Language>
+      <Language Name="ProjectLang">$00000000</Language>
+      <Language Name="RootDir"></Language>
+    </Language>
+    <VersionInfo>
+      <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+      <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+      <VersionInfo Name="MajorVer">1</VersionInfo>
+      <VersionInfo Name="MinorVer">0</VersionInfo>
+      <VersionInfo Name="Release">0</VersionInfo>
+      <VersionInfo Name="Build">0</VersionInfo>
+      <VersionInfo Name="Debug">False</VersionInfo>
+      <VersionInfo Name="PreRelease">False</VersionInfo>
+      <VersionInfo Name="Special">False</VersionInfo>
+      <VersionInfo Name="Private">False</VersionInfo>
+      <VersionInfo Name="DLL">False</VersionInfo>
+      <VersionInfo Name="Locale">1033</VersionInfo>
+      <VersionInfo Name="CodePage">1252</VersionInfo>
+    </VersionInfo>
+    <VersionInfoKeys>
+      <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
+      <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
+      <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+      <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+      <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+      <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+      <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+      <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
+      <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+      <VersionInfoKeys Name="Comments"></VersionInfoKeys>
+    </VersionInfoKeys>
+  </Delphi.Personality>
+</BorlandProject>
diff --git a/components/orpheus/tests/TestCalendar/project1.cfg b/components/orpheus/tests/TestCalendar/project1.cfg
new file mode 100644
index 000000000..34d0442f6
--- /dev/null
+++ b/components/orpheus/tests/TestCalendar/project1.cfg
@@ -0,0 +1,38 @@
+-$A8
+-$B-
+-$C+
+-$D+
+-$E-
+-$F-
+-$G+
+-$H+
+-$I+
+-$J-
+-$K-
+-$L+
+-$M-
+-$N+
+-$O+
+-$P+
+-$Q-
+-$R-
+-$S-
+-$T-
+-$U-
+-$V+
+-$W-
+-$X+
+-$YD
+-$Z1
+-cg
+-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+-H+
+-W+
+-M
+-$M16384,1048576
+-K$00400000
+-LE"c:\delphi7\Projects\Bpl"
+-LN"c:\delphi7\Projects\Bpl"
+-w-UNSAFE_TYPE
+-w-UNSAFE_CODE
+-w-UNSAFE_CAST
diff --git a/components/orpheus/tests/TestCalendar/project1.dof b/components/orpheus/tests/TestCalendar/project1.dof
new file mode 100644
index 000000000..fbb8e82c9
--- /dev/null
+++ b/components/orpheus/tests/TestCalendar/project1.dof
@@ -0,0 +1,136 @@
+[FileVersion]
+Version=7.0
+[Compiler]
+A=8
+B=0
+C=1
+D=1
+E=0
+F=0
+G=1
+H=1
+I=1
+J=0
+K=0
+L=1
+M=0
+N=1
+O=1
+P=1
+Q=0
+R=0
+S=0
+T=0
+U=0
+V=1
+W=0
+X=1
+Y=1
+Z=1
+ShowHints=1
+ShowWarnings=1
+UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+NamespacePrefix=
+SymbolDeprecated=1
+SymbolLibrary=1
+SymbolPlatform=1
+UnitLibrary=1
+UnitPlatform=1
+UnitDeprecated=1
+HResultCompat=1
+HidingMember=1
+HiddenVirtual=1
+Garbage=1
+BoundsError=1
+ZeroNilCompat=1
+StringConstTruncated=1
+ForLoopVarVarPar=1
+TypedConstVarPar=1
+AsgToTypedConst=1
+CaseLabelRange=1
+ForVariable=1
+ConstructingAbstract=1
+ComparisonFalse=1
+ComparisonTrue=1
+ComparingSignedUnsigned=1
+CombiningSignedUnsigned=1
+UnsupportedConstruct=1
+FileOpen=1
+FileOpenUnitSrc=1
+BadGlobalSymbol=1
+DuplicateConstructorDestructor=1
+InvalidDirective=1
+PackageNoLink=1
+PackageThreadVar=1
+ImplicitImport=1
+HPPEMITIgnored=1
+NoRetVal=1
+UseBeforeDef=1
+ForLoopVarUndef=1
+UnitNameMismatch=1
+NoCFGFileFound=1
+MessageDirective=1
+ImplicitVariants=1
+UnicodeToLocale=1
+LocaleToUnicode=1
+ImagebaseMultiple=1
+SuspiciousTypecast=1
+PrivatePropAccessor=1
+UnsafeType=0
+UnsafeCode=0
+UnsafeCast=0
+[Linker]
+MapFile=0
+OutputObjs=0
+ConsoleApp=1
+DebugInfo=0
+RemoteSymbols=0
+MinStackSize=16384
+MaxStackSize=1048576
+ImageBase=4194304
+ExeDescription=
+[Directories]
+OutputDir=
+UnitOutputDir=
+PackageDLLOutputDir=
+PackageDCPOutputDir=
+SearchPath=
+Packages=
+Conditionals=
+DebugSourceDirs=
+UsePackages=0
+[Parameters]
+RunParams=
+HostApplication=
+Launcher=
+UseLauncher=0
+DebugCWD=
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
diff --git a/components/orpheus/tests/TestCalendar/project1.dpr b/components/orpheus/tests/TestCalendar/project1.dpr
new file mode 100644
index 000000000..8a2e82e5d
--- /dev/null
+++ b/components/orpheus/tests/TestCalendar/project1.dpr
@@ -0,0 +1,18 @@
+program Project1;
+
+uses
+{$IFDEF LCL}
+  Interfaces,
+{$ENDIF}
+  Forms,
+  Unit1 in 'Unit1.pas' {Form1};
+
+{$IFDEF MSWINDOWS}
+{$R *.res}
+{$ENDIF}
+
+begin
+  Application.Initialize;
+  Application.CreateForm(TForm1, Form1);
+  Application.Run;
+end.
diff --git a/components/orpheus/tests/TestCalendar/project1.lpi b/components/orpheus/tests/TestCalendar/project1.lpi
new file mode 100644
index 000000000..78e86da7a
--- /dev/null
+++ b/components/orpheus/tests/TestCalendar/project1.lpi
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<CONFIG>
+  <ProjectOptions>
+    <PathDelim Value="\"/>
+    <Version Value="6"/>
+    <General>
+      <MainUnit Value="0"/>
+      <IconPath Value="./"/>
+      <TargetFileExt Value=".exe"/>
+      <ActiveEditorIndexAtStart Value="1"/>
+    </General>
+    <VersionInfo>
+      <ProjectVersion Value=""/>
+      <Language Value=""/>
+      <CharSet Value=""/>
+    </VersionInfo>
+    <PublishOptions>
+      <Version Value="2"/>
+      <IgnoreBinaries Value="False"/>
+      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
+      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
+    </PublishOptions>
+    <RunParams>
+      <local>
+        <FormatVersion Value="1"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+      </local>
+    </RunParams>
+    <RequiredPackages Count="2">
+      <Item1>
+        <PackageName Value="Orpheus"/>
+      </Item1>
+      <Item2>
+        <PackageName Value="LCL"/>
+      </Item2>
+    </RequiredPackages>
+    <Units Count="2">
+      <Unit0>
+        <Filename Value="project1.dpr"/>
+        <IsPartOfProject Value="True"/>
+        <CursorPos X="40" Y="8"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="0"/>
+        <UsageCount Value="20"/>
+        <Loaded Value="True"/>
+        <SyntaxHighlighter Value="Delphi"/>
+      </Unit0>
+      <Unit1>
+        <Filename Value="unit1.pas"/>
+        <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
+        <IsPartOfProject Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+        <ResourceFilename Value="unit1.lrs"/>
+        <UnitName Value="Unit1"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="1"/>
+        <UsageCount Value="20"/>
+        <Loaded Value="True"/>
+        <SyntaxHighlighter Value="Delphi"/>
+      </Unit1>
+    </Units>
+    <JumpHistory Count="0" HistoryIndex="-1"/>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="8"/>
+    <PathDelim Value="\"/>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+        <CStyleOperator Value="False"/>
+        <AllowLabel Value="False"/>
+        <CPPInline Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <Checks>
+        <IOChecks Value="True"/>
+        <RangeChecks Value="True"/>
+        <OverflowChecks Value="True"/>
+        <StackChecks Value="True"/>
+      </Checks>
+    </CodeGeneration>
+    <Linking>
+      <Options>
+        <Win32>
+          <GraphicApplication Value="True"/>
+        </Win32>
+      </Options>
+    </Linking>
+    <Other>
+      <Verbosity>
+        <ShowExecInfo Value="True"/>
+      </Verbosity>
+      <CompilerPath Value="$(CompPath)"/>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="2">
+      <Item1>
+        <Name Value="ECodetoolError"/>
+      </Item1>
+      <Item2>
+        <Name Value="EFOpenError"/>
+      </Item2>
+    </Exceptions>
+  </Debugging>
+</CONFIG>
diff --git a/components/orpheus/tests/TestCalendar/project1.res b/components/orpheus/tests/TestCalendar/project1.res
new file mode 100644
index 000000000..3adc0361f
Binary files /dev/null and b/components/orpheus/tests/TestCalendar/project1.res differ
diff --git a/components/orpheus/tests/TestCalendar/unit1.dfm b/components/orpheus/tests/TestCalendar/unit1.dfm
new file mode 100644
index 000000000..7ff0c4d0a
--- /dev/null
+++ b/components/orpheus/tests/TestCalendar/unit1.dfm
@@ -0,0 +1,33 @@
+object Form1: TForm1
+  Left = 192
+  Top = 114
+  Width = 440
+  Height = 336
+  Caption = 'Form1'
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  OldCreateOrder = False
+  PixelsPerInch = 96
+  TextHeight = 13
+  object OvcCalendar1: TOvcCalendar
+    Left = 56
+    Top = 40
+    Width = 313
+    Height = 209
+    BorderStyle = bsNone
+    Colors.ActiveDay = clRed
+    Colors.ColorScheme = cscalCustom
+    Colors.DayNames = clMaroon
+    Colors.Days = clBlack
+    Colors.InactiveDays = clGray
+    Colors.MonthAndYear = clBlue
+    Colors.Weekend = clRed
+    DayNameWidth = 3
+    Options = [cdoShortNames, cdoShowYear, cdoShowInactive, cdoShowRevert, cdoShowToday, cdoShowNavBtns]
+    TabOrder = 0
+  end
+end
diff --git a/components/orpheus/tests/TestCalendar/unit1.lfm b/components/orpheus/tests/TestCalendar/unit1.lfm
new file mode 100644
index 000000000..b02944b43
--- /dev/null
+++ b/components/orpheus/tests/TestCalendar/unit1.lfm
@@ -0,0 +1,30 @@
+object Form1: TForm1
+  Left = 192
+  Top = 114
+  Width = 432
+  Height = 302
+  Caption = 'Form1'
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Style = []
+  PixelsPerInch = 96
+  object OvcCalendar1: TOvcCalendar
+    Left = 56
+    Top = 40
+    Width = 313
+    Height = 209
+    BorderStyle = bsNone
+    Colors.ActiveDay = clRed
+    Colors.ColorScheme = cscalCustom
+    Colors.DayNames = clMaroon
+    Colors.Days = clBlack
+    Colors.InactiveDays = clGray
+    Colors.MonthAndYear = clBlue
+    Colors.Weekend = clRed
+    DayNameWidth = 3
+    Options = [cdoShortNames, cdoShowYear, cdoShowInactive, cdoShowRevert, cdoShowToday, cdoShowNavBtns]
+    TabOrder = 0
+  end
+end
diff --git a/components/orpheus/tests/TestCalendar/unit1.lrs b/components/orpheus/tests/TestCalendar/unit1.lrs
new file mode 100644
index 000000000..58f189f67
--- /dev/null
+++ b/components/orpheus/tests/TestCalendar/unit1.lrs
@@ -0,0 +1,13 @@
+LazarusResources.Add('TForm1','FORMDATA',[
+  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#192#0#3'Top'#2'r'#5'Width'#3#176#1#6'Heig'
+  +'ht'#3'.'#1#7'Caption'#6#5'Form1'#5'Color'#7#9'clBtnFace'#12'Font.Charset'#7
+  +#15'DEFAULT_CHARSET'#10'Font.Color'#7#12'clWindowText'#11'Font.Height'#2#245
+  +#10'Font.Style'#11#0#13'PixelsPerInch'#2'`'#0#12'TOvcCalendar'#12'OvcCalenda'
+  +'r1'#4'Left'#2'8'#3'Top'#2'('#5'Width'#3'9'#1#6'Height'#3#209#0#11'BorderSty'
+  +'le'#7#6'bsNone'#16'Colors.ActiveDay'#7#5'clRed'#18'Colors.ColorScheme'#7#11
+  +'cscalCustom'#15'Colors.DayNames'#7#8'clMaroon'#11'Colors.Days'#7#7'clBlack'
+  +#19'Colors.InactiveDays'#7#6'clGray'#19'Colors.MonthAndYear'#7#6'clBlue'#14
+  +'Colors.Weekend'#7#5'clRed'#12'DayNameWidth'#2#3#7'Options'#11#13'cdoShortNa'
+  +'mes'#11'cdoShowYear'#15'cdoShowInactive'#13'cdoShowRevert'#12'cdoShowToday'
+  +#14'cdoShowNavBtns'#0#8'TabOrder'#2#0#0#0#0
+]);
diff --git a/components/orpheus/tests/TestCalendar/unit1.pas b/components/orpheus/tests/TestCalendar/unit1.pas
new file mode 100644
index 000000000..c7dcf87c3
--- /dev/null
+++ b/components/orpheus/tests/TestCalendar/unit1.pas
@@ -0,0 +1,33 @@
+unit Unit1;
+
+interface
+
+uses
+  {$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, LResources, {$ENDIF}
+  SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, ovcbase, ovccal;
+
+type
+  TForm1 = class(TForm)
+    OvcCalendar1: TOvcCalendar;
+  private
+    { Private declarations }
+  public
+    { Public declarations }
+  end;
+
+var
+  Form1: TForm1;
+
+implementation
+
+{$IFNDEF LCL}
+{$R *.dfm}
+{$ENDIF}
+
+initialization
+{$IFDEF LCL}
+{$I unit1.lrs}  {Include form's resource file}
+{$ENDIF}
+
+end.