Fix text highlighting and the build

@nschonni is this right?