Updated colors and structure