Added theme logic