Added more color option functionality