Changes to support color tags