Revert "New Theme Engine [5/6]"

This reverts commit 1625b7ab2d3a81fb94daad3d63d9b8e5c826d7b7.

Change-Id: Ice204b4c6e68fe91fdca2fc96e1fec1a9fec1704