More _config.yml refactor