Revert "Squashed commit of the theme engine support."

This reverts commit e5dc35f36d059eaaf5f68779ddc44afb1f954545.