Make text colours match default theme values

Change-Id: I369b4cad45bed76d805f810d7b62265059ce3e20