fixed some spacing issue and color naming