Add syntax highlighting and json output