Merge "Color and text changes" into pi-dev