Fixed measuring difference in layout
Merge branch '2.1_bugfix'
Highlights were erased.
Added preference for CSS support.