YAML files are separated.
more improved
highlighting differences is re-implemented.