Update the popup generator script to use the new elements
Use it to generate the new popups. Also 'just worked'!