Replaced syntax highlighing; I lost it in the merge