Adjustments for new widget repo