Fixed highlighting and updated to work with sword 1.7