Added syntax highlighting and updated definitions