Revert "Squashed commit of the theme engine support."

This reverts commit 7b9396b9343888cdb160c73024a3713304e433a2.