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

This reverts commit 4091b219fd2123a287b61bc0bb8a2e2520d04f56.