Revised to use ColorType