Switched files to use future <widget> tag