Colorization and alignment improvements from DragonFly branch

As discussed on IRC (see title)