Updated to latest CustomElements