Fixed Settings with new options