Now works with themes