Updated <color> implementation