diff --git a/comp/src/gb.form/.info b/comp/src/gb.form/.info
index 4438d87d3..3ea900233 100644
--- a/comp/src/gb.form/.info
+++ b/comp/src/gb.form/.info
@@ -216,7 +216,7 @@ i
 _Properties
 C
 s
-*, Tag,HeightForm=200,WidthForm=300,FormatString=%dddd% %dd% %mmmm% %yyyy%,Value,Range,Alignment{Align.*}=Align.Center,Begin{DatePicker.*}=DatePicker.ThisDay
+*,Tag,HeightForm=200,WidthForm=300,FormatString=%dddd% %dd% %mmmm% %yyyy%,Value,Range,Alignment{Align.*}=Align.Center,Begin{DatePicker.*}=DatePicker.ThisDay
 _DefaultEvent
 C
 s
diff --git a/comp/src/gb.form/.project b/comp/src/gb.form/.project
index 2cfb4e4f8..0b8c85c87 100644
--- a/comp/src/gb.form/.project
+++ b/comp/src/gb.form/.project
@@ -1,6 +1,6 @@
 # Gambas Project File 3.0
 Startup=FMain
-Version=2.5.1
+Version=2.2.1
 VersionProgram=gbx2 -V
 Library=gb.gui
 Library=gb.form
diff --git a/comp/src/gb.form/FMain.form b/comp/src/gb.form/FMain.form
index d7ae78c8c..588284b80 100644
--- a/comp/src/gb.form/FMain.form
+++ b/comp/src/gb.form/FMain.form
@@ -7,8 +7,7 @@
   Arrangement = Arrange.Fill
   Spacing = 8
   Padding = 8
-  { ColorChooser1 ColorChooser
-    MoveScaled(30,18,36,36)
-    ShowAlpha = True
+  { DatePicker1 DatePicker
+    MoveScaled(34,23,20,4)
   }
 }
diff --git a/comp/src/gb.form/map/gnome.map b/comp/src/gb.form/map/gnome.map
index 6611c24d2..c4253becc 100644
--- a/comp/src/gb.form/map/gnome.map
+++ b/comp/src/gb.form/map/gnome.map
@@ -7,6 +7,7 @@ audio           mimetypes/gnome-mime-application-ogg.png
 book            stock/generic/stock_book_blue.png
 bookmark        stock/object/stock_bookmark.png
 bottom          actions/stock_bottom.png
+calendar        mimetypes/vcalendar.png
 camera          devices/camera.png
 cancel          stock/generic/stock_calc-cancel.png
 cdrom           devices/cdrom_unmount.png
diff --git a/comp/src/gb.form/map/kde.map b/comp/src/gb.form/map/kde.map
index 1dc86196b..da910b2c9 100644
--- a/comp/src/gb.form/map/kde.map
+++ b/comp/src/gb.form/map/kde.map
@@ -7,6 +7,7 @@ audio             mimetypes/sound.png
 book              actions/contents2.png
 bookmark          actions/bookmark.png
 bottom            actions/bottom.png
+calendar          actions/kontact_date.png
 camera            devices/camera.png
 cancel            actions/button_cancel.png
 cdrom             devices/cdrom_unmount.png
diff --git a/comp/src/gb.form/map/map b/comp/src/gb.form/map/map
index 394a3d3f8..1022b5da0 100644
--- a/comp/src/gb.form/map/map
+++ b/comp/src/gb.form/map/map
@@ -7,6 +7,7 @@ audio
 book
 bookmark
 bottom
+calendar
 camera
 cancel
 cdrom