Change options to a new syntax