Updated to the new(er) version of the widget system