Show the theme name in the choice screen

Change-Id: Id4d054773a9ac1610fe3536850f98928d4848403