A few little changes to the Theme helper/facade