Cleanup examples, add highlighting and options