Revert "Update Theme Service"

This reverts commit 903e3f3796db9fa4f5063ffb8beee1090e15ba45.