Catch up with latest Widget spec changes.