change mapping; add highlight white space plugin