Follow our own theme chooser

Change-Id: I2899c51514e22b2bb19d90398a343ef6123affce