more color modifications

Made more color modifications and added TODO doc.