Use the new color/line/etc. functions.

We need a more careful alignment function, but this is back to working as it was.