Updated the format and colors