Revert "Squashed commit of the theme engine support."

This reverts commit 664970413d28a0d2bc8eed0b7a66c1cc88a6b7e5.