Working on theme integration