Colors dataset, plus fixes to filename regexes