Refactor diff-color definitions more