Added more support for person-theme pages