--- a/Cairo__Format.st	Sat Dec 27 00:45:13 2014 +0100
+++ b/Cairo__Format.st	Sun Dec 28 22:38:24 2014 +0100
@@ -4,62 +4,62 @@
 
 SharedPool subclass:#Format
 	instanceVariableNames:''
-	classVariableNames:'FORMAT_ARGB32 FORMAT_RGB24 FORMAT_A8 FORMAT_A1'
+	classVariableNames:'CAIRO_FORMAT_INVALID CAIRO_FORMAT_ARGB32 CAIRO_FORMAT_RGB24
+		CAIRO_FORMAT_A8 CAIRO_FORMAT_A1 CAIRO_FORMAT_RGB16_565
+		CAIRO_FORMAT_RGB30'
 	poolDictionaries:''
 	category:'Cairo-Constants'
 !
 
-
 !Format class methodsFor:'initialization'!
 
 initialize
 
-	FORMAT_ARGB32 := 0.
-	FORMAT_RGB24 := 1.
-	FORMAT_A8 := 2.
-	FORMAT_A1 := 3.
-
-    "Modified: / 10-09-2008 / 18:19:52 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    CAIRO_FORMAT_INVALID := -1.
+    CAIRO_FORMAT_ARGB32 := 0.
+    CAIRO_FORMAT_RGB24 := 1.
+    CAIRO_FORMAT_A8 := 2.
+    CAIRO_FORMAT_A1 := 3.
+    CAIRO_FORMAT_RGB16_565 := 4.
+    CAIRO_FORMAT_RGB30 := 5.
 ! !
 
 !Format class methodsFor:'constants'!
 
-FORMAT_A1
+CAIRO_FORMAT_A1
 
-	^FORMAT_A1
-
-    "Modified: / 10-09-2008 / 18:19:52 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    ^CAIRO_FORMAT_A1
 !
 
-FORMAT_A8
+CAIRO_FORMAT_A8
 
-	^FORMAT_A8
+    ^CAIRO_FORMAT_A8
+!
 
-    "Modified: / 10-09-2008 / 18:19:52 / Jan Vrany <vranyj1@fel.cvut.cz>"
+CAIRO_FORMAT_ARGB32
+
+    ^CAIRO_FORMAT_ARGB32
 !
 
-FORMAT_ARGB32
+CAIRO_FORMAT_INVALID
 
-	^FORMAT_ARGB32
+    ^CAIRO_FORMAT_INVALID
+!
 
-    "Modified: / 10-09-2008 / 18:19:52 / Jan Vrany <vranyj1@fel.cvut.cz>"
+CAIRO_FORMAT_RGB16_565
+
+    ^CAIRO_FORMAT_RGB16_565
 !
 
-FORMAT_RGB24
+CAIRO_FORMAT_RGB24
 
-	^FORMAT_RGB24
+    ^CAIRO_FORMAT_RGB24
+!
 
-    "Modified: / 10-09-2008 / 18:19:52 / Jan Vrany <vranyj1@fel.cvut.cz>"
+CAIRO_FORMAT_RGB30
+
+    ^CAIRO_FORMAT_RGB30
 ! !
 
-!Format class methodsFor:'documentation'!
-
-version
-    ^'$Id$'
-!
-
-version_HG
-    ^ '$Changeset: <not expanded> $'
-! !
 
 Format initialize!