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

This reverts commit c3a4a04f98a8e8e7f89af8aae43545ce4f116466.

Change-Id: Iba2f119ad1aad01f6fd5b8a7a70f965608d2c747