Adding syntax highlighting and zaw
Fix for github changes