New Theme Chooser UI

Change-Id: I44424435f97da24438938265ae7f8a3317c1781e