added some syntax highlighting for commands
Added @DEFINE for syntax highlighting
Cleanup