Update and rename widget.xml to widget2.xml