worked on theme integration