Updated to use new widget versions