Dynamic widgets patch