utf-8 names fix, flows highlighting changed