Revert "Framework: Remove orphaned Theme related code"

This reverts commit 474388af102b84f12c7f52068cf757a578a6adff.