Code higlight tweaks