Remove diff tool, and add color