#31101 Decouple widgets and embed code