More theme cleanup