Tweak order of file, re-add hostname and add more colours