Link to 1167 for Widgets & Embeds refactor