Add diff/merge tools and clean up color config