Dist conflicts
Nest data inside type for shortcode templates
Update embed templates to use new nested data format
Create display_button macro
Disty mergemerge