Some vim highlighting improvements