Fixed bug with the new color system and choices selection (ref #25)