Revert "Squashed commit of the theme engine support."

This reverts commit 3633a4e09812a6ec3ca3ceece817137af2620e18.