Add MatchTag & indent-guides