Fix the font handling esp wrt font colors.

Change-Id: I7dda03368f67ea6a12dfb39115f4546277abb76b