Better handling of syntax highlighting