Build work on theme integration, start on flow