Color-coding

And some format work, too.