added workaround for highlighting for Mac OS X and Windows
save last used background color
Merge branch 'highlight'