Update to syntax highlight main bufer as well as remove warnings