Updated Etsy + Formating