Updated gif & gfy handling