Finishing widget refactor, `spotlight` is not completed.