Updated font-lock keywords