Add better json highlighter
Cleanup aliases.