Some more improvements to highlighting rules + custom outdenting, behaviour