Fixed: Charset is set for all file types