Update: Adding color tag support