fixed compilation issues
fixed file coloring issue