refs: bf0823c9a2 - continuing the work of splitting up the theme service into logical components
bf0823c9a2