Rebuild and added syntax highlighting