toolbar work, rethemed routes for new migration