Add support for cygwin, add highlighting back