diff --git a/components/callite/demo2/testCalLite.lpi b/components/callite/demo2/testCalLite.lpi
index 186e2781c..f0851d414 100644
--- a/components/callite/demo2/testCalLite.lpi
+++ b/components/callite/demo2/testCalLite.lpi
@@ -73,6 +73,11 @@
         <DebugInfoType Value="dsDwarf2Set"/>
         <UseExternalDbgSyms Value="True"/>
       </Debugging>
+      <Options>
+        <Win32>
+          <GraphicApplication Value="True"/>
+        </Win32>
+      </Options>
     </Linking>
   </CompilerOptions>
   <Debugging>
diff --git a/components/callite/demo2/umaintestcallite.pp b/components/callite/demo2/umaintestcallite.pp
index a6d07e9a5..044c436a9 100644
--- a/components/callite/demo2/umaintestcallite.pp
+++ b/components/callite/demo2/umaintestcallite.pp
@@ -124,7 +124,6 @@ begin
   result := EncodeDate(year, month, day);
 end;
 
-
 procedure TForm1.FormCreate(Sender: TObject);
 var
   opt: TCalOption;
@@ -193,6 +192,7 @@ begin
     3: demoCal.Languages := lgHebrew;
     4: demoCal.Languages := lgSpanish;
   end;
+  copyCal.Languages := demoCal.Languages;
 end;
 
 procedure TForm1.rgStartingDOWClick(Sender: TObject);
@@ -246,7 +246,9 @@ begin
   opt := TCalOption(Index);
   if (opt in demoCal.Options) then
     demoCal.Options := demoCal.Options - [opt]
-  else demoCal.Options := demoCal.Options + [opt];
+  else
+    demoCal.Options := demoCal.Options + [opt];
+  copyCal.Options := demoCal.Options;
 end;
 
 procedure TForm1.CbAddHolidayNameToCellChange(Sender: TObject);
@@ -368,13 +370,13 @@ var
 begin
   if (AMonth = 11) and (ADay = 11) and not (csOtherMonth in AState) then begin
     bmp := TBitmap.Create;
-    ImageList1.GetBitmap(0, bmp);
-    ACanvas.Draw(ARect.Left, (ARect.Top + ARect.Bottom - bmp.Height) div 2, bmp);
-    inc(ARect.Left, bmp.Width + 2);
-    (*
-    ACanvas.TextOut(ARect.Left, (ARect.Top + ARect.Bottom - ACanvas.TextHeight('Tg')) div 2, intToStr(ADay));
-    AContinueDrawing := false;  // Skips built-in painting of this day cell
-    *)
+    try
+      ImageList1.GetBitmap(0, bmp);
+      ACanvas.Draw(ARect.Left, (ARect.Top + ARect.Bottom - bmp.Height) div 2, bmp);
+      inc(ARect.Left, bmp.Width + 2);
+    finally
+      bmp.Free;
+    end;
   end;
 end;
 
diff --git a/components/callite/source/calendarlite.pas b/components/callite/source/calendarlite.pas
index 77cd9fc4d..aee5d52bf 100644
--- a/components/callite/source/calendarlite.pas
+++ b/components/callite/source/calendarlite.pas
@@ -55,7 +55,7 @@ const
   DefCalWidth = 210;
   DefMinHeight = 120;
   DefMinWidth = 120;
-  DefaultDisplayText = 'Today is,dd/mm/yyyy,Holidays during,There are no holidays set for';
+  DefaultDisplayText = 'Today is|mmm dd", " yyyy|Holidays during|There are no holidays set for';
   DefTStyle: TTextStyle = (Alignment  : taCenter; Layout     : tlCenter;
                            SingleLine : False;    Clipping   : True;
                            ExpandTabs : False;    ShowPrefix : False;
@@ -64,20 +64,20 @@ const
                            EndEllipsis: False);
 
    //Ariel Rodriguez 12/09/2013
-  EnglishDays = 'Sun,Mon,Tue,Wed,Thu,Fri,Sat';
-  EnglishMonths = 'January,February,March,April,May,June,July,August,September,October,November,December';
-  HebrewDays = 'א,ב,ג,ד,ה,ו,ש';
-  HebrewMonths = ('ינואר,פברואר,מרץ,אפריל,מאי,יוני,    יולי,אוגוסט,ספטמבר,אוקטובר,נובמבר,דצמבר');
-  HebrewTexts = 'היום הוא,yyyy-mm-dd,במהלך החגים, אין חגים מוגדרים עבור';
-  FrenchDays = 'dim,lun,mar,mer,jeu,ven,sm';
-  FrenchMonths = 'janvier,février,mars,avril,mai,juin,juillet,août,septembre,octobre,novembre,décembre';
-  FrenchTexts = 'Est aujourd''hui,yyyy/mm/dd,vacances pendant,Il n''y a pas de jours fériés fixés pour';
-  GermanMonths = 'Januar,Februar,März,April,Mai,Juni,Juli,August,September,Oktober,November,Dezember';
-  GermanDays = 'Son,Mon,Die,Mit,Don,Fre,Sam';
-  GermamTexts = 'Heute ist,yyyy/mm/dd,Urlaub während,Es gibt keine Feiertage eingestellt für';
-  SpanishDays = 'Dom,Lun,Mar,Mie,Jue,Vie,Sab';
-  SpanishMonths = 'Enero,Febrero,Marzo,Abril,Mayo,Junio,Julio,Agosto,Septiembre,Octubre,Noviembre,Diciembre';
-  SpanishTexts = 'Hoy es,dd/mm/yyyy,Dias de fiestas,No hay dias feriados establecidos para';
+  EnglishDays = 'Sun|Mon|Tue|Wed|Thu|Fri|Sat';
+  EnglishMonths = 'January|February|March|April|May|June|July|August|September|October|November|December';
+  HebrewDays = 'א|ב|ג|ד|ה|ו|ש';
+  HebrewMonths = ('ינואר|פברואר|מרץ|אפריל|מאי|יוני|    יולי|אוגוסט|ספטמבר|אוקטובר|נובמב|דצמבר');
+  HebrewTexts = 'היום הוא|yyyy-mm-dd|במהלך החגים| אין חגים מוגדרים עבור';
+  FrenchDays = 'dim|lun|mar|mer|jeu|ven|sm';
+  FrenchMonths = 'janvier|février|mars|avril|mai|juin|juillet|août|septembre|octobre|novembre|décembre';
+  FrenchTexts = 'Est aujourd''hui|dd/mm/yyyy|vacances pendant|Il n''y a pas de jours fériés fixés pour';
+  GermanMonths = 'Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember';
+  GermanDays = 'So|Mo|Di|Mi|Do|Fr|Sa';
+  GermamTexts = 'Heute ist|dd/mm/yyyy|Urlaub während|Es sind keine Feiertage vorhanden im';
+  SpanishDays = 'Dom<Lun|Mar|Mie|Jue|Vie|Sab';
+  SpanishMonths = 'Enero|Febrero|Marzo|Abril|Mayo|Junio|Julio|Agosto|Septiembre|Octubre|Noviembre|Diciembre';
+  SpanishTexts = 'Hoy es|dd/mm/yyyy|Dias de fiestas|No hay dias feriados establecidos para';
    //Ariel Rodriguez 12/09/2013
 
 type
@@ -1091,7 +1091,7 @@ begin
   FWeekendDays := [dowSunday, dowSaturday];
   FOptions := [coShowTodayFrame, coBoldHolidays, coShowWeekend, coShowHolidays,
                coShowTodayRow];
-  FLanguage := lgEnglish; //Ariel Rodriguez 12/09/2013
+  SetLanguage(lgEnglish); //Ariel Rodriguez 12/09/2013
   FPrevMouseDate := 0;
 end;
 
@@ -1127,7 +1127,7 @@ end;
 
 function TCalendarLite.GetDayNames: String;
 begin
-  Result := FDayNames.CommaText;
+  Result := FDayNames.DelimitedText;
 end;
 
 function TCalendarLite.GetDisplayText(aTextIndex: TDisplayText): String;
@@ -1149,7 +1149,7 @@ end;
 
 function TCalendarLite.GetMonthNames: String;
 begin
-  Result := FMonthNames.CommaText;
+  Result := FMonthNames.DelimitedText;
 end;
 
 procedure TCalendarLite.HolidayMenuItemClicked(Sender: TObject);
@@ -1375,25 +1375,28 @@ end;
 
 procedure TCalendarLite.SetDayNames(const AValue: String);
 begin
-  FDayNames.CommaText := AValue;
+  FDayNames.Delimiter := '|';
+  FDayNames.DelimitedText := AValue;
   Invalidate;
 end;
 
 procedure TCalendarLite.SetDefaultDisplayTexts;
 begin
-  FDisplayTexts.CommaText := DefaultDisplayText;
+  FDisplayTexts.Delimiter := '|';
+  FDisplayTexts.DelimitedText := DefaultDisplayText;
 end;
 
 procedure TCalendarLite.SetDisplayTexts(AValue: String);
 begin
-  FDisplayTexts.CommaText := AValue;
+  FDisplayTexts.Delimiter := '|';
+  FDisplayTexts.DelimitedText := AValue;
   Invalidate;
 end;
 
 //Ariel Rodriguez 12/09/2013
 procedure TCalendarLite.SetLanguage(AValue : TLanguage);
 begin
-  if FLanguage = AValue then Exit;
+//  if FLanguage = AValue then Exit;
   FLanguage := AValue;
 
   case FLanguage of
@@ -1435,7 +1438,8 @@ end;
 //Ariel Rodriguez 12/09/2013
 procedure TCalendarLite.SetMonthNames(const AValue: String);
 begin
-  FMonthNames.CommaText := AValue;
+  FMonthNames.Delimiter := '|';
+  FMonthNames.DelimitedText := AValue;
   Invalidate;
 end;