Ticket #1870: Adding new steps and fixing syntax highlighting