Fixing token definitions for c21 listings
Updating backup & migrate