Went back to multiple pot files, added additional formats