Added types and colors