Small cleanups, add Pygments colour vars, fix up quotes.