Revert "New Theme Engine [3/6]"

This reverts commit bf380703c40f61458c31d6582617478881fe4902.

Change-Id: I21dc7726345e0be143334dedba217ebd0605d177