Refactor, add PNG crypter