Fix up handling of enabled: color option