Update to use skitch::version1 and skitch::version2