touchups for theme integration