theme cleanup and mobile prep