More theme cleanup.