updated with new widget source files