Added basic shapes, colors