Upadte build system, fix some syntax highlighting bugs