Fixed themes to work with latest API changes