Replaced AutoClose with auto-pairs