Added the detection for color-shorthand option