Revert "Themes: Let ThemeService handle all theme processing [2/3]"

This reverts commit 3da4d83f005700d6c9890f33ca5d3b2be95b4e69.