Added color property to Square and Circle