Enhanced theme select/goback functionality