working on theme integration