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

This reverts commit 0ff1e0c88179797eb0eeff3d2114b056a28f4654.