New version of Popup

We have added a new version of popup which supports all template.