Merged highlighting files
Fixed parameters constant
Adapted to the merged highlighting file