Move colordiff to diff