Added support for square color.