enhanced theme integration