Added more syntax highlighting