Make it easier to theme via Theme Chooser

Change-Id: I66476d058b73541a903d299fb381cf1f83cae860