Added Colors and some type adjustments