More Theme object model additions