Update to highlight blocks
Add utf8 charset