add changes for format and colors