fixed themes and naming problems