update charset, add bookorm, update file names