More theme integration