Updated highlight method to support tintcolor