Added new shapes and colors