Also tweak styles for the supported ones slightly. Change-Id: Ia4f0f3627d062698c085cd60f72928ef16532d20