Refactor diff-related color definitions