Changed around some hardcoded filetypes