Colors and ShapeType Enums added