Fixed file names - added ability to highlight