Updated regex and xpi.