Added theme capability