Revert "New Theme Engine [6/6]"

This reverts commit 27326b40ce26095fe1cb6ebf5ca1ceff2b2fa4a5.

Change-Id: Ia1d6fb7bb64e1048e5647abe2206b7b4ed128b87