A lot of fixes in order for it to work with new widgets and BaseKit features