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

This reverts commit a42dae9e3bd6e4f99a8b7960578d922fdbb7d529.