Add Gherkin-highlight, change order