Cleanup BundleConfig and bundle the widgets
OCD much?
Merge remote-tracking branch 'origin/master'