Use variables for option sets and remove references to "color"