Starting to add support for different themes