Updated colors and formatting