Allow changing theme on the fly (#2874)

Change-Id: I70c153c4109428686002f985bfe1cb7cba2c9b31