Merge "Folder polish - update color extraction, fix contrast issues."