fix all toolkit references