revert to pygments; add literate fixes