Move options to core template