Adding Support for color tags