Updated to use new pygments implementation