Add json highlight, fix long line highlight