Add colors and comments