#870 Add new white and black option