Auto-pairs, old plugin restored