Added colour files, merge fixes.