Re-commit recent changes for Color Legend