Add Theme engine support