Bump toolkit to 3.1.0
Fix paths broken by moving to v3 of toolkit