Fixed regexp, more filetypes