Continuation on !2149 (merged), fixing everything except the console. Turns out the console had a special handling on coloring, so it needed to be fixed separately.
Fixes #920 (closed)