Added png and jpg stuff