Improve the formatter, resolving issue #19
Update ALL the things to correctly use the new colour formatting syntax.