This should be adjusted to also include all of the core widget files