Updated with widget files