Make theme consistant.

Change-Id: I2f89861193ac963934d23fdf8a3252228015b1fa