Most plotting style changes from last week merged