fixes themes and cities