Fixed the set of colors and added message colors