Minor alterations to allow for more flexible themability