@Markus Kraus first off great work and thank you for sharing.

Is there anyway that this can be made to work with customised widgets? I had to copy the OOTB Widget to make customer requested changes but this solution doesn't seem to work unless I use the OOTB Widget