Completed migration of CSV  and BorderStyle + Fill