Fix ordering of commands to make custom syntax highlighting work