latextoc mappings are all normal maps
Merged some local updates with jonasdiemers fix