Revert "Squashed commit of the theme engine support."

This reverts commit b5198af887fab568b981032a320be2302dc4d05e.