Code highlight, templates rework