Squashed commit of the theme engine support.