Upgraded pygments
cleanup